Author: cbieneman
Date: Thu Oct 1 19:56:53 2015
New Revision: 249115
URL: http://llvm.org/viewvc/llvm-project?rev=249115&view=rev
Log:
[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.
Modified:
cfe/trunk/CMakeLists.txt
Modified: cfe/trunk/CMakeLists.txt
URL:
http://llvm.org/viewvc/llvm-project/cfe/trunk/CMakeLists.txt?rev=249115&r1=249114&r2=249115&view=diff
==============================================================================
--- cfe/trunk/CMakeLists.txt (original)
+++ cfe/trunk/CMakeLists.txt Thu Oct 1 19:56:53 2015
@@ -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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
