Thanks, Richard, for the advice on how to fix to LLVM_ENABLE_MODULES build. I trust this is what you were suggesting?
I have been unable to test this, because I have not yet been able to get the stage 2 build working in my environment. (That is, the build fails before it hits the error reported by the buildbot.) The change is simple enough, though, that my plan is to just watch the buildbot and verify that it starts working again.