Skip to content

Commit 5abef0b

Browse files
committed
Revert "[compiler-rt] Fix scudo build on ARM"
This broke fuchsia cross-compile. This reverts commit f1f3dd6.
1 parent 0960971 commit 5abef0b

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

compiler-rt/lib/scudo/standalone/CMakeLists.txt

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -138,19 +138,8 @@ set(SCUDO_SOURCES_CXX_WRAPPERS
138138
)
139139

140140
set(SCUDO_OBJECT_LIBS)
141-
set(SCUDO_LINK_LIBS)
142141

143142
if (COMPILER_RT_HAS_GWP_ASAN)
144-
if(COMPILER_RT_USE_LLVM_UNWINDER)
145-
list(APPEND SCUDO_LINK_LIBS ${COMPILER_RT_UNWINDER_LINK_LIBS} dl)
146-
elseif (COMPILER_RT_HAS_GCC_S_LIB)
147-
list(APPEND SCUDO_LINK_LIBS gcc_s)
148-
elseif (COMPILER_RT_HAS_GCC_LIB)
149-
list(APPEND SCUDO_LINK_LIBS gcc)
150-
else()
151-
message(FATAL_ERROR "No suitable unwinder library")
152-
endif()
153-
154143
add_dependencies(scudo_standalone gwp_asan)
155144
list(APPEND SCUDO_OBJECT_LIBS
156145
RTGwpAsan RTGwpAsanBacktraceLibc RTGwpAsanSegvHandler
@@ -163,6 +152,8 @@ if (COMPILER_RT_HAS_GWP_ASAN)
163152

164153
endif()
165154

155+
set(SCUDO_LINK_LIBS ${COMPILER_RT_UNWINDER_LINK_LIBS})
156+
166157
if(COMPILER_RT_BUILD_SCUDO_STANDALONE_WITH_LLVM_LIBC)
167158
include_directories(${COMPILER_RT_BINARY_DIR}/../libc/include/)
168159

0 commit comments

Comments
 (0)