[PATCH] D71428: [clang] Move CLANG_BOOTSTRAP_CMAKE_ARGS above PASSTHROUGH_VARIABLES

[Xin-Xin Wang via Phabricator via cfe-commits]

xinxinw1 created this revision.
Herald added subscribers: cfe-commits, mgorny.
Herald added a project: clang.

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.


Repository:
  rG LLVM Github Monorepo

https://reviews.llvm.org/D71428

Files:
  clang/CMakeLists.txt


Index: clang/CMakeLists.txt
===================================================================
--- clang/CMakeLists.txt
+++ clang/CMakeLists.txt
@@ -801,8 +801,8 @@
                 # 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}


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D71428.233660.patch
Type: text/x-patch
Size: 645 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20191212/bc13fbea/attachment.bin>