[compiler-rt] r311757 - Revert "Add Clang dependency to the check for Clang C++ headers."

Adrian Prantl via llvm-commits llvm-commits at lists.llvm.org
Thu Aug 24 19:36:36 PDT 2017


Author: adrian
Date: Thu Aug 24 19:36:36 2017
New Revision: 311757

URL: http://llvm.org/viewvc/llvm-project?rev=311757&view=rev
Log:
Revert "Add Clang dependency to the check for Clang C++ headers."

This temporarily reverts commit r311733, because of bot breakage.
http://lab.llvm.org:8080/green/job/clang-stage1-configure-RA_build/38139/consoleFull#-256426522e9a0fee5-ebcc-4238-a641-c5aa112c323e

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

Modified: compiler-rt/trunk/cmake/Modules/CompilerRTCompile.cmake
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/cmake/Modules/CompilerRTCompile.cmake?rev=311757&r1=311756&r2=311757&view=diff
==============================================================================
--- compiler-rt/trunk/cmake/Modules/CompilerRTCompile.cmake (original)
+++ compiler-rt/trunk/cmake/Modules/CompilerRTCompile.cmake Thu Aug 24 19:36:36 2017
@@ -67,8 +67,8 @@ function(clang_compile object_file sourc
   if(NOT COMPILER_RT_STANDALONE_BUILD)
     list(APPEND SOURCE_DEPS clang compiler-rt-headers)
   endif()
-  if (TARGET CheckClangHeaders)
-    list(APPEND SOURCE_DEPS CheckClangHeaders)
+  if (TARGET CompilerRTUnitTestCheckCxx)
+    list(APPEND SOURCE_DEPS CompilerRTUnitTestCheckCxx)
   endif()
   string(REGEX MATCH "[.](cc|cpp)$" is_cxx ${source_rpath})
   string(REGEX MATCH "[.](m|mm)$" is_objc ${source_rpath})
@@ -132,10 +132,12 @@ macro(clang_compiler_add_cxx_check)
       "  false"
       "fi"
       )
-    add_custom_target(CheckClangHeaders
+    add_custom_target(CompilerRTUnitTestCheckCxx
       COMMAND bash -c "${CMD}"
       COMMENT "Checking that just-built clang can find C++ headers..."
       VERBATIM)
-    ADD_DEPENDENCIES(CheckClangHeaders clang)
+    if (TARGET clang)
+      ADD_DEPENDENCIES(CompilerRTUnitTestCheckCxx clang)
+    endif()
   endif()
 endmacro()




More information about the llvm-commits mailing list