diff options
| author | Zachary Turner <zturner@google.com> | 2017-09-15 22:10:46 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-09-15 22:10:46 +0000 |
| commit | 3144b244f7c6f8cc229118087e36f082b42fb6cf (patch) | |
| tree | 96edff3452d0687cc9e3b3a1159f3006f8329f67 /runtime | |
| parent | 76889b5ed5baef12d4f2888f7ff9fee677c940c3 (diff) | |
Resubmit "[lit] Force site configs to run before source-tree configs"
This is a resubmission of r313270. It broke standalone builds of
compiler-rt because we were not correctly generating the llvm-lit
script in the standalone build directory.
The fixes incorporated here attempt to find llvm/utils/llvm-lit
from the source tree returned by llvm-config. If present, it
will generate llvm-lit into the output directory. Regardless,
the user can specify -DLLVM_EXTERNAL_LIT to point to a specific
lit.py on their file system. This supports the use case of
someone installing lit via a package manager. If it cannot find
a source tree, and -DLLVM_EXTERNAL_LIT is either unspecified or
invalid, then we print a warning that tests will not be able
to run.
Differential Revision: https://reviews.llvm.org/D37756
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@313407 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'runtime')
| -rw-r--r-- | runtime/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/runtime/CMakeLists.txt b/runtime/CMakeLists.txt index 470f190209..f89cd4903f 100644 --- a/runtime/CMakeLists.txt +++ b/runtime/CMakeLists.txt @@ -77,6 +77,7 @@ if(LLVM_BUILD_EXTERNAL_COMPILER_RT AND EXISTS ${COMPILER_RT_SRC_ROOT}/) -DCOMPILER_RT_INCLUDE_TESTS=${LLVM_INCLUDE_TESTS} -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} -DLLVM_LIBDIR_SUFFIX=${LLVM_LIBDIR_SUFFIX} + -DLLVM_RUNTIME_OUTPUT_INTDIR=${LLVM_RUNTIME_OUTPUT_INTDIR} -DCMAKE_OSX_DEPLOYMENT_TARGET=${CMAKE_OSX_DEPLOYMENT_TARGET} -DCMAKE_OSX_SYSROOT:PATH=${CMAKE_OSX_SYSROOT} ${COMPILER_RT_PASSTHROUGH_VARIABLES} |