diff options
| author | Zachary Turner <zturner@google.com> | 2017-09-14 21:30:27 +0000 |
|---|---|---|
| committer | Zachary Turner <zturner@google.com> | 2017-09-14 21:30:27 +0000 |
| commit | a7049bd48c2f680aee9e9afbd1b50b5c61da9a2f (patch) | |
| tree | f2d87730f565abc35e22b5336525104886d8890a /clang/runtime | |
| parent | 6b396c2c22510136fd34da3535ba0d9e402ce3a8 (diff) | |
| download | llvm-a7049bd48c2f680aee9e9afbd1b50b5c61da9a2f.zip llvm-a7049bd48c2f680aee9e9afbd1b50b5c61da9a2f.tar.gz llvm-a7049bd48c2f680aee9e9afbd1b50b5c61da9a2f.tar.bz2 | |
Fix 2 stage build on some apple bots.
The recent lit refactor changed the location of the lit script
run by check targets from <source>/utils/lit/lit.py to
<bin>/llvm-lit.py. In some 2-stage build scenarios, the location
of <bin> was not properly passed through to the second stage,
and it was looking for /llvm-lit.py instead, causing failures.
Fix suggested by Mike Edwards and Chris Bieneman @apple
llvm-svn: 313300
Diffstat (limited to 'clang/runtime')
| -rw-r--r-- | clang/runtime/CMakeLists.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/clang/runtime/CMakeLists.txt b/clang/runtime/CMakeLists.txt index 470f190..f89cd49 100644 --- a/clang/runtime/CMakeLists.txt +++ b/clang/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} |