summaryrefslogtreecommitdiff
path: root/cmake
diff options
context:
space:
mode:
authorAdrian Prantl <aprantl@apple.com>2017-08-25 02:36:36 +0000
committerAdrian Prantl <aprantl@apple.com>2017-08-25 02:36:36 +0000
commit3df7fc1705d67ca499eeab1585996f279aa1d125 (patch)
treed77880ee1e0c8b76f970a41c44039a8142fd9c89 /cmake
parent91a66eaad21db9edfd37def4fab63addfc39a5a2 (diff)
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 git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@311757 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'cmake')
-rw-r--r--cmake/Modules/CompilerRTCompile.cmake10
1 files changed, 6 insertions, 4 deletions
diff --git a/cmake/Modules/CompilerRTCompile.cmake b/cmake/Modules/CompilerRTCompile.cmake
index d1dfb74bb..4c6568167 100644
--- a/cmake/Modules/CompilerRTCompile.cmake
+++ b/cmake/Modules/CompilerRTCompile.cmake
@@ -67,8 +67,8 @@ function(clang_compile object_file source)
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()