This is an archive of the discontinued LLVM Phabricator instance.

Differential D37126

Add Clang dependency to the check for Clang C++ headers.
ClosedPublic

Authored by george.karpenkov on Aug 24 2017, 3:59 PM.

Details

Reviewers
kubamracek
kcc
Commits
rGcdb8341e6207: Add Clang dependency to the check for Clang C++ headers.
rCRT311733: Add Clang dependency to the check for Clang C++ headers.
rL311733: Add Clang dependency to the check for Clang C++ headers.
Summary

The problem is that CMake is mostly imperative and the result of
processing "if (TARGET blah)" checks depends on the order of import of
CMake files.
In this case, "projects" folder is registered before "tools",
and calling "CheckClangHeaders" [renamed to have a better name]
errors out without even giving Clang a chance to be built.

This, in turn, leads to libFuzzer bot failures in some circumstances on
some machines (depends on whether LIT or UNIT tests are scheduled
first).

Diff Detail

Repository
rL LLVM

Event Timeline

george.karpenkov created this revision.Aug 24 2017, 3:59 PM
Herald added a subscriber: mgorny. · View Herald TranscriptAug 24 2017, 3:59 PM
kubamracek accepted this revision.Aug 24 2017, 4:26 PM

LGTM (assuming standalone compiler-rt build still works)

This revision is now accepted and ready to land.Aug 24 2017, 4:26 PM
Closed by commit rL311733: Add Clang dependency to the check for Clang C++ headers. (authored by george.karpenkov). · Explain WhyAug 24 2017, 4:45 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
trunk/
cmake/
Modules/
10 lines

Diff 112636

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

Show First 20 Lines • Show All 61 Lines • ▼ Show 20 Lines
# CFLAGS <list of compile flags> # CFLAGS <list of compile flags>
# DEPS <list of dependencies>) # DEPS <list of dependencies>)
function(clang_compile object_file source) function(clang_compile object_file source)
cmake_parse_arguments(SOURCE "" "" "CFLAGS;DEPS" ${ARGN}) cmake_parse_arguments(SOURCE "" "" "CFLAGS;DEPS" ${ARGN})
get_filename_component(source_rpath ${source} REALPATH) get_filename_component(source_rpath ${source} REALPATH)
if(NOT COMPILER_RT_STANDALONE_BUILD) if(NOT COMPILER_RT_STANDALONE_BUILD)
list(APPEND SOURCE_DEPS clang compiler-rt-headers) list(APPEND SOURCE_DEPS clang compiler-rt-headers)
endif() endif()
if (TARGET CompilerRTUnitTestCheckCxx) if (TARGET CheckClangHeaders)
list(APPEND SOURCE_DEPS CompilerRTUnitTestCheckCxx) list(APPEND SOURCE_DEPS CheckClangHeaders)
endif() endif()
string(REGEX MATCH "[.](cc|cpp)$" is_cxx ${source_rpath}) string(REGEX MATCH "[.](cc|cpp)$" is_cxx ${source_rpath})
string(REGEX MATCH "[.](m|mm)$" is_objc ${source_rpath}) string(REGEX MATCH "[.](m|mm)$" is_objc ${source_rpath})
if(is_cxx) if(is_cxx)
string(REPLACE " " ";" global_flags "${CMAKE_CXX_FLAGS}") string(REPLACE " " ";" global_flags "${CMAKE_CXX_FLAGS}")
else() else()
string(REPLACE " " ";" global_flags "${CMAKE_C_FLAGS}") string(REPLACE " " ";" global_flags "${CMAKE_C_FLAGS}")
endif() endif()
▲ Show 20 Lines • Show All 47 Lines • ▼ Show 20 Lines set(CMD
" echo 'This can also be fixed by checking out the libcxx project from llvm.org and installing the headers'" " echo 'This can also be fixed by checking out the libcxx project from llvm.org and installing the headers'"
" echo 'into your build directory:'" " echo 'into your build directory:'"
" echo ' cd ${LLVM_MAIN_SRC_DIR}/projects && svn co http://llvm.org/svn/llvm-project/libcxx/trunk libcxx'" " echo ' cd ${LLVM_MAIN_SRC_DIR}/projects && svn co http://llvm.org/svn/llvm-project/libcxx/trunk libcxx'"
" echo ' cd ${LLVM_BINARY_DIR} && make -C ${LLVM_MAIN_SRC_DIR}/projects/libcxx installheaders HEADER_DIR=${LLVM_BINARY_DIR}/include'" " echo ' cd ${LLVM_BINARY_DIR} && make -C ${LLVM_MAIN_SRC_DIR}/projects/libcxx installheaders HEADER_DIR=${LLVM_BINARY_DIR}/include'"
" echo" " echo"
" false" " false"
"fi" "fi"
) )
add_custom_target(CompilerRTUnitTestCheckCxx add_custom_target(CheckClangHeaders
COMMAND bash -c "${CMD}" COMMAND bash -c "${CMD}"
COMMENT "Checking that just-built clang can find C++ headers..." COMMENT "Checking that just-built clang can find C++ headers..."
VERBATIM) VERBATIM)
if (TARGET clang) ADD_DEPENDENCIES(CheckClangHeaders clang)
ADD_DEPENDENCIES(CompilerRTUnitTestCheckCxx clang)
endif()
endif() endif()
endmacro() endmacro()