diff options
| author | Chris Bieneman <beanz@apple.com> | 2015-10-02 00:56:53 +0000 |
|---|---|---|
| committer | Chris Bieneman <beanz@apple.com> | 2015-10-02 00:56:53 +0000 |
| commit | fdbbd25d0d2b77b434155b27e3665c831633ead9 (patch) | |
| tree | 7e4672047ffb9e01e7bf3225093eb21429a056ca /clang | |
| parent | 7d3c3efae493deb4defae81df6d4598eb996a15d (diff) | |
| download | bcm5719-llvm-fdbbd25d0d2b77b434155b27e3665c831633ead9.tar.gz bcm5719-llvm-fdbbd25d0d2b77b434155b27e3665c831633ead9.zip | |
[CMake] Fixing clang bootstrap to use LLVM_RUNTIME_OUTPUT_INTDIR instead of CMAKE_BINARY_DIR.
This should make bootstrap builds work with multi-configuration generators.
llvm-svn: 249115
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/CMakeLists.txt | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/clang/CMakeLists.txt b/clang/CMakeLists.txt index 0cc388eb35b..e7a8cdcc34c 100644 --- a/clang/CMakeLists.txt +++ b/clang/CMakeLists.txt @@ -598,9 +598,9 @@ if (CLANG_ENABLE_BOOTSTRAP) # DARWIN_LTO_LIBRARY so that -flto will work using the just-built compiler if(APPLE) set(LTO_DEP LTO llvm-ar llvm-ranlib) - set(LTO_LIBRARY -DDARWIN_LTO_LIBRARY=${CMAKE_BINARY_DIR}/lib/libLTO.dylib) - set(LTO_AR -DCMAKE_AR=${CMAKE_BINARY_DIR}/bin/llvm-ar) - set(LTO_RANLIB -DCMAKE_RANLIB=${CMAKE_BINARY_DIR}/bin/llvm-ranlib) + set(LTO_LIBRARY -DDARWIN_LTO_LIBRARY=${LLVM_RUNTIME_OUTPUT_INTDIR}/libLTO.dylib) + set(LTO_AR -DCMAKE_AR=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ar) + set(LTO_RANLIB -DCMAKE_RANLIB=${LLVM_RUNTIME_OUTPUT_INTDIR}/llvm-ranlib) endif() add_custom_target(bootstrap-clear @@ -628,9 +628,9 @@ if (CLANG_ENABLE_BOOTSTRAP) # seem to work, so instead I'm passing this through -DCMAKE_INSTALL_PREFIX=${CMAKE_INSTALL_PREFIX} ${CLANG_BOOTSTRAP_CMAKE_ARGS} - -DCMAKE_CXX_COMPILER=${CMAKE_BINARY_DIR}/bin/clang++ - -DCMAKE_C_COMPILER=${CMAKE_BINARY_DIR}/bin/clang - -DCMAKE_ASM_COMPILER=${CMAKE_BINARY_DIR}/bin/clang + -DCMAKE_CXX_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++ + -DCMAKE_C_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang + -DCMAKE_ASM_COMPILER=${LLVM_RUNTIME_OUTPUT_INTDIR}/clang ${LTO_LIBRARY} ${LTO_AR} ${LTO_RANLIB} INSTALL_COMMAND "" STEP_TARGETS configure build |
