Skip to content

Commit 70316d3

Browse files
committed
Revert "Fix lld detection in standalone compiler-rt."
Breaks sanitizer-android buildbot. This reverts commit d562032.
1 parent e0e7d06 commit 70316d3

File tree

2 files changed

+1
-2
lines changed

2 files changed

+1
-2
lines changed

compiler-rt/CMakeLists.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -497,7 +497,7 @@ else()
497497
if(EXISTS ${COMPILER_RT_LLD_PATH}/ AND LLVM_TOOL_LLD_BUILD)
498498
set(COMPILER_RT_HAS_LLD TRUE)
499499
else()
500-
set(COMPILER_RT_HAS_LLD ${COMPILER_RT_HAS_FUSE_LD_LLD_FLAG})
500+
set(COMPILER_RT_HAS_LLD FALSE)
501501
endif()
502502
endif()
503503
pythonize_bool(COMPILER_RT_HAS_LLD)

compiler-rt/cmake/config-ix.cmake

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,6 @@ check_library_exists(stdc++ __cxa_throw "" COMPILER_RT_HAS_LIBSTDCXX)
146146

147147
# Linker flags.
148148
check_linker_flag("-Wl,-z,text" COMPILER_RT_HAS_Z_TEXT)
149-
check_linker_flag("-fuse-ld=lld" COMPILER_RT_HAS_FUSE_LD_LLD_FLAG)
150149

151150
if(ANDROID)
152151
check_linker_flag("-Wl,-z,global" COMPILER_RT_HAS_Z_GLOBAL)

0 commit comments

Comments
 (0)