[clang] 61c8ee6 - [clang] Move CLANG_BOOTSTRAP_CMAKE_ARGS above PASSTHROUGH_VARIABLES

[Shoaib Meenai via cfe-commits]

Author: Xin-Xin Wang
Date: 2019-12-13T19:05:04-08:00
New Revision: 61c8ee6a2fa490bc224d006cd03efd650f6561bb

URL: https://github.com/llvm/llvm-project/commit/61c8ee6a2fa490bc224d006cd03efd650f6561bb
DIFF: https://github.com/llvm/llvm-project/commit/61c8ee6a2fa490bc224d006cd03efd650f6561bb.diff

LOG: [clang] Move CLANG_BOOTSTRAP_CMAKE_ARGS above PASSTHROUGH_VARIABLES

I want to pass some CMake cache files in CLANG_BOOTSTRAP_CMAKE_ARGS as
`-C <cache file>.cmake` arguments. I want to be able to use the values
of the bootstrap passthrough variables in the cache files, so the cache
file arguments need to be after passthrough variables. This should be
safe because the values of passthrough variables are all constants and
can't refer to values in CLANG_BOOTSTRAP_CMAKE_ARGS.

Differential Revision: https://reviews.llvm.org/D71428

Added: 
    

Modified: 
    clang/CMakeLists.txt

Removed: 
    


################################################################################
diff  --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 45d2431a7462..bc172b468512 100644
--- a/clang/CMakeLists.txt
+++ b/clang/CMakeLists.txt
@@ -801,8 +801,8 @@ if (CLANG_ENABLE_BOOTSTRAP)
                 # We shouldn't need to set this here, but INSTALL_DIR doesn't
                 # seem to work, so instead I'm passing this through
                 -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX}
-                ${CLANG_BOOTSTRAP_CMAKE_ARGS}
                 ${PASSTHROUGH_VARIABLES}
+                ${CLANG_BOOTSTRAP_CMAKE_ARGS}
                  -DCLANG_STAGE=${NEXT_CLANG_STAGE}
                 ${COMPILER_OPTIONS}
                 ${${CLANG_STAGE}_CONFIG}