[compiler-rt] r323061 - [sanitizer] Pass the CMake compiler to custom libc++ build

Petr Hosek via llvm-commits llvm-commits at lists.llvm.org
Sat Jan 20 19:22:23 PST 2018


Author: phosek
Date: Sat Jan 20 19:22:22 2018
New Revision: 323061

URL: http://llvm.org/viewvc/llvm-project?rev=323061&view=rev
Log:
[sanitizer] Pass the CMake compiler to custom libc++ build

This addresses the error introduced in r323054 on some bots.

Modified:
    compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake

Modified: compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake?rev=323061&r1=323060&r2=323061&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/AddCompilerRT.cmake Sat Jan 20 19:22:22 2018
@@ -482,6 +482,9 @@ macro(add_custom_libcxx name prefix)
     if(NOT COMPILER_RT_STANDALONE_BUILD)
       set(force_deps DEPENDS clang)
     endif()
+  else()
+    set(compiler_args -DCMAKE_C_COMPILER=${CMAKE_C_COMPILER}
+                      -DCMAKE_CXX_COMPILER=${CMAKE_CXX_COMPILER})
   endif()
 
   if(CMAKE_SYSROOT)




More information about the llvm-commits mailing list