From 827f2fb423cbf06dba56fee30cb1e7691b5c3943 Mon Sep 17 00:00:00 2001 From: Chris Bieneman Date: Fri, 2 Oct 2015 00:56:53 +0000 Subject: [PATCH] [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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@249115 91177308-0d34-0410-b5e6-96231b3b80d8 --- CMakeLists.txt | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 0cc388eb35..e7a8cdcc34 100644 --- a/CMakeLists.txt +++ b/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 -- 2.40.0