Author: dsanders Date: Wed Feb 3 11:02:28 2016 New Revision: 259661 URL: http://llvm.org/viewvc/llvm-project?rev=259661&view=rev Log: Merging r259493: ------------------------------------------------------------------------ r259493 | dsanders | 2016-02-02 12:55:28 +0000 (Tue, 02 Feb 2016) | 7 lines
[compiler-rt] add_custom_libcxx should pass LLVM_PATH and a C++ compiler Reviewers: samsonov Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D16681 ------------------------------------------------------------------------ Modified: compiler-rt/branches/release_38/CMakeLists.txt compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake Modified: compiler-rt/branches/release_38/CMakeLists.txt URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/CMakeLists.txt?rev=259661&r1=259660&r2=259661&view=diff ============================================================================== --- compiler-rt/branches/release_38/CMakeLists.txt (original) +++ compiler-rt/branches/release_38/CMakeLists.txt Wed Feb 3 11:02:28 2016 @@ -66,8 +66,10 @@ if (NOT COMPILER_RT_STANDALONE_BUILD) # Windows where we need to use clang-cl instead. if(NOT MSVC) set(COMPILER_RT_TEST_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang) + set(COMPILER_RT_TEST_CXX_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++) else() set(COMPILER_RT_TEST_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang.exe) + set(COMPILER_RT_TEST_CXX_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang++.exe) endif() else() # Take output dir and install path from the user. @@ -81,6 +83,7 @@ else() option(COMPILER_RT_ENABLE_WERROR "Fail and stop if warning is triggered" OFF) # Use a host compiler to compile/link tests. set(COMPILER_RT_TEST_COMPILER ${CMAKE_C_COMPILER} CACHE PATH "Compiler to use for testing") + set(COMPILER_RT_TEST_CXX_COMPILER ${CMAKE_CXX_COMPILER} CACHE PATH "C++ Compiler to use for testing") if (NOT LLVM_CONFIG_PATH) find_program(LLVM_CONFIG_PATH "llvm-config" Modified: compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake URL: http://llvm.org/viewvc/llvm-project/compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake?rev=259661&r1=259660&r2=259661&view=diff ============================================================================== --- compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake (original) +++ compiler-rt/branches/release_38/cmake/Modules/AddCompilerRT.cmake Wed Feb 3 11:02:28 2016 @@ -290,11 +290,12 @@ macro(add_custom_libcxx name prefix) SOURCE_DIR ${COMPILER_RT_LIBCXX_PATH} CMAKE_ARGS -DCMAKE_MAKE_PROGRAM:STRING=${CMAKE_MAKE_PROGRAM} -DCMAKE_C_COMPILER=${COMPILER_RT_TEST_COMPILER} - -DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_COMPILER} + -DCMAKE_CXX_COMPILER=${COMPILER_RT_TEST_CXX_COMPILER} -DCMAKE_C_FLAGS=${LIBCXX_CFLAGS} -DCMAKE_CXX_FLAGS=${LIBCXX_CFLAGS} -DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX:PATH=<INSTALL_DIR> + -DLLVM_PATH=${LLVM_MAIN_SRC_DIR} LOG_BUILD 1 LOG_CONFIGURE 1 LOG_INSTALL 1 _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
