This is an archive of the discontinued LLVM Phabricator instance.

Differential D81629

[CMake][compiler-rt] Only set lld as available when it was built
ClosedPublic

Authored by phosek on Jun 10 2020, 8:05 PM.

Details

Reviewers
vitalybuka
smeenai
Commits
rGcf1d04484344: [CMake][compiler-rt] Only set lld as available when it was built
Summary

The -fuse-ld=lld check might succeed because there's a system lld,
but that lld may be out-of-date which would cause any tests that
attempt to use for LTO fail. This was observed on some of the bots.

Diff Detail

Event Timeline

phosek created this revision.Jun 10 2020, 8:05 PM
Herald added a project: Restricted Project. · View Herald TranscriptJun 10 2020, 8:05 PM
Herald added subscribers: Restricted Project, dexonsmith, mgorny, dberris. · View Herald Transcript
Harbormaster completed remote builds in B59913: Diff 270026.Jun 10 2020, 9:34 PM
smeenai accepted this revision.Jun 11 2020, 12:57 PM

Makes sense to me.

This revision is now accepted and ready to land.Jun 11 2020, 12:57 PM
Closed by commit rGcf1d04484344: [CMake][compiler-rt] Only set lld as available when it was built (authored by phosek). · Explain WhyJun 29 2020, 3:18 PM
This revision was automatically updated to reflect the committed changes.

Revision Contents

PathSize
compiler-rt/
2 lines

Diff 274261

compiler-rt/CMakeLists.txt

Show First 20 Lines • Show All 529 Lines • ▼ Show 20 Lines
set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/tools/lld) set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/tools/lld)
if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD) if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD)
set(COMPILER_RT_HAS_LLD TRUE) set(COMPILER_RT_HAS_LLD TRUE)
else() else()
set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/../lld) set(COMPILER_RT_LLD_PATH ${LLVM_MAIN_SRC_DIR}/../lld)
if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD) if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD)
set(COMPILER_RT_HAS_LLD TRUE) set(COMPILER_RT_HAS_LLD TRUE)
else()
set(COMPILER_RT_HAS_LLD ${COMPILER_RT_HAS_FUSE_LD_LLD_FLAG})
endif() endif()
endif() endif()
pythonize_bool(COMPILER_RT_HAS_LLD) pythonize_bool(COMPILER_RT_HAS_LLD)
add_subdirectory(lib) add_subdirectory(lib)
if(COMPILER_RT_INCLUDE_TESTS) if(COMPILER_RT_INCLUDE_TESTS)
add_subdirectory(unittests) add_subdirectory(unittests)
Show All 17 Lines