summaryrefslogtreecommitdiffstats
path: root/libcxx/cmake
diff options
context:
space:
mode:
authorZachary Turner <zturner@google.com>2017-09-19 17:19:10 +0000
committerZachary Turner <zturner@google.com>2017-09-19 17:19:10 +0000
commit50105d294241f2cd45b38c4304dda4f7df11abee (patch)
treeb42fe1f2d0d184cc5c1b155b93ee874a35459f03 /libcxx/cmake
parent7bda2c6baf965413a2f151d38bf717d14fd3d0c4 (diff)
downloadbcm5719-llvm-50105d294241f2cd45b38c4304dda4f7df11abee.tar.gz
bcm5719-llvm-50105d294241f2cd45b38c4304dda4f7df11abee.zip
Resubmit "Fix llvm-lit script generation in libcxx."
After speaking with the libcxx owners, they agreed that this is a bug in the bot that needs to be fixed by the bot owners, and the CMake changes are correct. llvm-svn: 313643
Diffstat (limited to 'libcxx/cmake')
-rw-r--r--libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake5
1 files changed, 5 insertions, 0 deletions
diff --git a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
index 879882dcfea..b724bf69f1a 100644
--- a/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
+++ b/libcxx/cmake/Modules/HandleOutOfTreeLLVM.cmake
@@ -106,6 +106,11 @@ macro(configure_out_of_tree_llvm)
set(LLVM_ENABLE_SPHINX OFF)
endif()
+ # In a standalone build, we don't have llvm to automatically generate the
+ # llvm-lit script for us. So we need to provide an explicit directory that
+ # the configurator should write the script into.
+ set(LLVM_LIT_OUTPUT_DIR "${libcxx_BINARY_DIR}/bin")
+
# Required LIT Configuration ------------------------------------------------
# Define the default arguments to use with 'lit', and an option for the user
# to override.
OpenPOWER on IntegriCloud