[compiler-rt] r201674 - [CMake] Use host compiler to run lit tests in standalone mode

[Alexey Samsonov]

Author: samsonov
Date: Wed Feb 19 07:45:49 2014
New Revision: 201674

URL: http://llvm.org/viewvc/llvm-project?rev=201674&view=rev
Log:
[CMake] Use host compiler to run lit tests in standalone mode

Modified:
    compiler-rt/trunk/CMakeLists.txt
    compiler-rt/trunk/test/lit.common.configured.in

Modified: compiler-rt/trunk/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/CMakeLists.txt?rev=201674&r1=201673&r2=201674&view=diff
==============================================================================
--- compiler-rt/trunk/CMakeLists.txt (original)
+++ compiler-rt/trunk/CMakeLists.txt Wed Feb 19 07:45:49 2014
@@ -41,8 +41,7 @@ if (NOT COMPILER_RT_STANDALONE_BUILD)
   option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests."
          ${LLVM_INCLUDE_TESTS})
   # Use just-built Clang to compile/link tests.
-  # FIXME: Use an absolute path instead.
-  set(COMPILER_RT_TEST_COMPILER clang)
+  set(COMPILER_RT_TEST_COMPILER ${LLVM_RUNTIME_OUTPUT_INTDIR}/clang)
 else()
   # Take output dir and install path from the user.
   set(COMPILER_RT_OUTPUT_DIR ${CMAKE_CURRENT_BINARY_DIR} CACHE PATH
@@ -51,7 +50,7 @@ else()
     "Path where built compiler-rt libraries should be installed.")
   option(COMPILER_RT_INCLUDE_TESTS "Generate and build compiler-rt unit tests." OFF)
   # Use a host compiler to compile/link tests.
-  set(COMPILER_RT_TEST_COMPILER ${CMAKE_CXX_COMPILER})
+  set(COMPILER_RT_TEST_COMPILER ${CMAKE_C_COMPILER})
 
   set(LLVM_CONFIG_PATH "" CACHE PATH "Path to llvm-config binary")
   if (NOT LLVM_CONFIG_PATH)

Modified: compiler-rt/trunk/test/lit.common.configured.in
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.configured.in?rev=201674&r1=201673&r2=201674&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.configured.in (original)
+++ compiler-rt/trunk/test/lit.common.configured.in Wed Feb 19 07:45:49 2014
@@ -15,7 +15,7 @@ set_default("llvm_src_root", "@LLVM_SOUR
 set_default("llvm_obj_root", "@LLVM_BINARY_DIR@")
 set_default("compiler_rt_src_root", "@COMPILER_RT_SOURCE_DIR@")
 set_default("llvm_tools_dir", "@LLVM_TOOLS_DIR@")
-set_default("clang", "@LLVM_BINARY_DIR@/bin/clang")
+set_default("clang", "@COMPILER_RT_TEST_COMPILER@")
 set_default("compiler_rt_arch", "@COMPILER_RT_SUPPORTED_ARCH@")
 set_default("python_executable", "@PYTHON_EXECUTABLE@")
 set_default("compiler_rt_debug", @COMPILER_RT_DEBUG_PYBOOL@)