summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorXin-Xin Wang <get@xin-xin.me>2019-12-13 19:04:36 -0800
committerShoaib Meenai <smeenai@fb.com>2019-12-13 19:05:04 -0800
commit61c8ee6a2fa490bc224d006cd03efd650f6561bb (patch)
treea09c67648095298bb4e88c90bd6fdcd2dc3195ab
parenta0aa58dad53f2e5e90a9b7079ec31bf7c3144fc7 (diff)
downloadbcm5719-llvm-61c8ee6a2fa490bc224d006cd03efd650f6561bb.tar.gz
bcm5719-llvm-61c8ee6a2fa490bc224d006cd03efd650f6561bb.zip
[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
-rw-r--r--clang/CMakeLists.txt2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt
index 45d2431a746..bc172b46851 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}
OpenPOWER on IntegriCloud