Skip to content

Commit e129d4e

Browse files
vitalybukaaaryanshukla
vitalybuka
authored and
aaryanshukla
committed
Revert "[compiler-rt] Remove redundant COMPILER_RT_HAS_*SAN checks" (llvm#98380)
Reverts llvm#98240 https://lab.llvm.org/buildbot/#/builders/109/builds/816
1 parent 7beeb89 commit e129d4e

File tree

14 files changed

+328
-307
lines changed

14 files changed

+328
-307
lines changed

‎compiler-rt/lib/CMakeLists.txt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,11 +47,11 @@ if(COMPILER_RT_BUILD_SANITIZERS)
4747
endforeach()
4848
endif()
4949

50-
if(COMPILER_RT_BUILD_PROFILE)
50+
if(COMPILER_RT_BUILD_PROFILE AND COMPILER_RT_HAS_PROFILE)
5151
compiler_rt_build_runtime(profile)
5252
endif()
5353

54-
if(COMPILER_RT_BUILD_CTX_PROFILE)
54+
if(COMPILER_RT_BUILD_CTX_PROFILE AND COMPILER_RT_HAS_CTX_PROFILE)
5555
compiler_rt_build_runtime(ctx_profile)
5656
endif()
5757

‎compiler-rt/lib/gwp_asan/CMakeLists.txt‎

Lines changed: 39 additions & 37 deletions
Original file line numberDiff line numberDiff line change
@@ -65,46 +65,48 @@ set(GWP_ASAN_SEGV_HANDLER_HEADERS
6565
set(GWP_ASAN_OPTIONS_PARSER_CFLAGS
6666
${GWP_ASAN_CFLAGS})
6767

68-
foreach(arch ${GWP_ASAN_SUPPORTED_ARCH})
69-
add_compiler_rt_runtime(
70-
clang_rt.gwp_asan
71-
STATIC
72-
ARCHS ${arch}
73-
SOURCES ${GWP_ASAN_SOURCES}
74-
ADDITIONAL_HEADERS ${GWP_ASAN_HEADERS}
75-
CFLAGS ${GWP_ASAN_CFLAGS}
76-
PARENT_TARGET gwp_asan
77-
)
78-
endforeach()
68+
if (COMPILER_RT_HAS_GWP_ASAN)
69+
foreach(arch ${GWP_ASAN_SUPPORTED_ARCH})
70+
add_compiler_rt_runtime(
71+
clang_rt.gwp_asan
72+
STATIC
73+
ARCHS ${arch}
74+
SOURCES ${GWP_ASAN_SOURCES}
75+
ADDITIONAL_HEADERS ${GWP_ASAN_HEADERS}
76+
CFLAGS ${GWP_ASAN_CFLAGS}
77+
PARENT_TARGET gwp_asan
78+
)
79+
endforeach()
7980

80-
add_compiler_rt_object_libraries(RTGwpAsan
81-
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
82-
SOURCES ${GWP_ASAN_SOURCES}
83-
ADDITIONAL_HEADERS ${GWP_ASAN_HEADERS}
84-
CFLAGS ${GWP_ASAN_CFLAGS})
81+
add_compiler_rt_object_libraries(RTGwpAsan
82+
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
83+
SOURCES ${GWP_ASAN_SOURCES}
84+
ADDITIONAL_HEADERS ${GWP_ASAN_HEADERS}
85+
CFLAGS ${GWP_ASAN_CFLAGS})
8586

86-
add_compiler_rt_object_libraries(RTGwpAsanOptionsParser
87-
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
88-
SOURCES ${GWP_ASAN_OPTIONS_PARSER_SOURCES}
89-
ADDITIONAL_HEADERS ${GWP_ASAN_OPTIONS_PARSER_HEADERS}
90-
CFLAGS ${GWP_ASAN_OPTIONS_PARSER_CFLAGS})
87+
add_compiler_rt_object_libraries(RTGwpAsanOptionsParser
88+
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
89+
SOURCES ${GWP_ASAN_OPTIONS_PARSER_SOURCES}
90+
ADDITIONAL_HEADERS ${GWP_ASAN_OPTIONS_PARSER_HEADERS}
91+
CFLAGS ${GWP_ASAN_OPTIONS_PARSER_CFLAGS})
9192

92-
# As above, build the pre-implemented optional backtrace support libraries.
93-
add_compiler_rt_object_libraries(RTGwpAsanBacktraceLibc
94-
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
95-
SOURCES optional/backtrace_linux_libc.cpp
96-
ADDITIONAL_HEADERS ${GWP_ASAN_BACKTRACE_HEADERS}
97-
CFLAGS ${GWP_ASAN_CFLAGS})
98-
add_compiler_rt_object_libraries(RTGwpAsanSegvHandler
99-
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
100-
SOURCES optional/segv_handler_posix.cpp
101-
ADDITIONAL_HEADERS ${GWP_ASAN_SEGV_HANDLER_HEADERS}
102-
CFLAGS ${GWP_ASAN_CFLAGS})
103-
add_compiler_rt_object_libraries(RTGwpAsanBacktraceSanitizerCommon
104-
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
105-
SOURCES optional/backtrace_sanitizer_common.cpp
106-
ADDITIONAL_HEADERS ${GWP_ASAN_BACKTRACE_HEADERS}
107-
CFLAGS ${GWP_ASAN_CFLAGS} ${SANITIZER_COMMON_CFLAGS})
93+
# As above, build the pre-implemented optional backtrace support libraries.
94+
add_compiler_rt_object_libraries(RTGwpAsanBacktraceLibc
95+
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
96+
SOURCES optional/backtrace_linux_libc.cpp
97+
ADDITIONAL_HEADERS ${GWP_ASAN_BACKTRACE_HEADERS}
98+
CFLAGS ${GWP_ASAN_CFLAGS})
99+
add_compiler_rt_object_libraries(RTGwpAsanSegvHandler
100+
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
101+
SOURCES optional/segv_handler_posix.cpp
102+
ADDITIONAL_HEADERS ${GWP_ASAN_SEGV_HANDLER_HEADERS}
103+
CFLAGS ${GWP_ASAN_CFLAGS})
104+
add_compiler_rt_object_libraries(RTGwpAsanBacktraceSanitizerCommon
105+
ARCHS ${GWP_ASAN_SUPPORTED_ARCH}
106+
SOURCES optional/backtrace_sanitizer_common.cpp
107+
ADDITIONAL_HEADERS ${GWP_ASAN_BACKTRACE_HEADERS}
108+
CFLAGS ${GWP_ASAN_CFLAGS} ${SANITIZER_COMMON_CFLAGS})
109+
endif()
108110

109111
if(COMPILER_RT_INCLUDE_TESTS)
110112
add_subdirectory(tests)

‎compiler-rt/lib/lsan/CMakeLists.txt‎

Lines changed: 35 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -43,44 +43,46 @@ add_compiler_rt_object_libraries(RTLSanCommon
4343
ADDITIONAL_HEADERS ${LSAN_HEADERS}
4444
CFLAGS ${LSAN_CFLAGS})
4545

46-
add_compiler_rt_component(lsan)
47-
if(APPLE)
48-
set(LSAN_LINK_LIBS ${SANITIZER_COMMON_LINK_LIBS})
46+
if(COMPILER_RT_HAS_LSAN)
47+
add_compiler_rt_component(lsan)
48+
if(APPLE)
49+
set(LSAN_LINK_LIBS ${SANITIZER_COMMON_LINK_LIBS})
4950

50-
add_weak_symbols("lsan" WEAK_SYMBOL_LINK_FLAGS)
51-
add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINK_FLAGS)
51+
add_weak_symbols("lsan" WEAK_SYMBOL_LINK_FLAGS)
52+
add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINK_FLAGS)
5253

53-
add_compiler_rt_runtime(clang_rt.lsan
54-
SHARED
55-
OS ${LSAN_SUPPORTED_OS}
56-
ARCHS ${LSAN_SUPPORTED_ARCH}
57-
SOURCES ${LSAN_SOURCES}
58-
ADDITIONAL_HEADERS ${LSAN_HEADERS}
59-
OBJECT_LIBS RTLSanCommon
60-
RTInterception
61-
RTSanitizerCommon
62-
RTSanitizerCommonLibc
63-
RTSanitizerCommonCoverage
64-
RTSanitizerCommonSymbolizer
65-
CFLAGS ${LSAN_CFLAGS}
66-
LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS} ${WEAK_SYMBOL_LINK_FLAGS}
67-
LINK_LIBS ${LSAN_LINK_LIBS}
68-
PARENT_TARGET lsan)
69-
else()
70-
foreach(arch ${LSAN_SUPPORTED_ARCH})
7154
add_compiler_rt_runtime(clang_rt.lsan
72-
STATIC
73-
ARCHS ${arch}
55+
SHARED
56+
OS ${LSAN_SUPPORTED_OS}
57+
ARCHS ${LSAN_SUPPORTED_ARCH}
7458
SOURCES ${LSAN_SOURCES}
75-
$<TARGET_OBJECTS:RTInterception.${arch}>
76-
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
77-
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
78-
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
79-
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
80-
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
81-
$<TARGET_OBJECTS:RTLSanCommon.${arch}>
8259
ADDITIONAL_HEADERS ${LSAN_HEADERS}
60+
OBJECT_LIBS RTLSanCommon
61+
RTInterception
62+
RTSanitizerCommon
63+
RTSanitizerCommonLibc
64+
RTSanitizerCommonCoverage
65+
RTSanitizerCommonSymbolizer
8366
CFLAGS ${LSAN_CFLAGS}
67+
LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS} ${WEAK_SYMBOL_LINK_FLAGS}
68+
LINK_LIBS ${LSAN_LINK_LIBS}
8469
PARENT_TARGET lsan)
85-
endforeach()
70+
else()
71+
foreach(arch ${LSAN_SUPPORTED_ARCH})
72+
add_compiler_rt_runtime(clang_rt.lsan
73+
STATIC
74+
ARCHS ${arch}
75+
SOURCES ${LSAN_SOURCES}
76+
$<TARGET_OBJECTS:RTInterception.${arch}>
77+
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
78+
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
79+
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
80+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
81+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizerInternal.${arch}>
82+
$<TARGET_OBJECTS:RTLSanCommon.${arch}>
83+
ADDITIONAL_HEADERS ${LSAN_HEADERS}
84+
CFLAGS ${LSAN_CFLAGS}
85+
PARENT_TARGET lsan)
86+
endforeach()
87+
endif()
8688
endif()

‎compiler-rt/lib/nsan/CMakeLists.txt‎

Lines changed: 25 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -25,29 +25,31 @@ set(NSAN_DYNAMIC_LINK_FLAGS ${SANITIZER_COMMON_LINK_FLAGS})
2525

2626
set(NSAN_CFLAGS ${SANITIZER_COMMON_CFLAGS})
2727

28-
foreach(arch ${NSAN_SUPPORTED_ARCH})
29-
add_compiler_rt_runtime(
30-
clang_rt.nsan
31-
STATIC
32-
ARCHS ${arch}
33-
SOURCES ${NSAN_SOURCES}
34-
$<TARGET_OBJECTS:RTInterception.${arch}>
35-
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
36-
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
37-
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
38-
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
39-
$<TARGET_OBJECTS:RTUbsan.${arch}>
40-
ADDITIONAL_HEADERS ${NSAN_HEADERS}
41-
CFLAGS ${NSAN_CFLAGS}
42-
PARENT_TARGET nsan
43-
)
44-
endforeach()
45-
46-
add_compiler_rt_object_libraries(RTNsan
47-
ARCHS ${NSAN_SUPPORTED_ARCH}
48-
SOURCES ${NSAN_SOURCES}
49-
ADDITIONAL_HEADERS ${NSAN_HEADERS}
50-
CFLAGS ${NSAN_CFLAGS})
28+
if (COMPILER_RT_HAS_NSAN)
29+
foreach(arch ${NSAN_SUPPORTED_ARCH})
30+
add_compiler_rt_runtime(
31+
clang_rt.nsan
32+
STATIC
33+
ARCHS ${arch}
34+
SOURCES ${NSAN_SOURCES}
35+
$<TARGET_OBJECTS:RTInterception.${arch}>
36+
$<TARGET_OBJECTS:RTSanitizerCommon.${arch}>
37+
$<TARGET_OBJECTS:RTSanitizerCommonLibc.${arch}>
38+
$<TARGET_OBJECTS:RTSanitizerCommonCoverage.${arch}>
39+
$<TARGET_OBJECTS:RTSanitizerCommonSymbolizer.${arch}>
40+
$<TARGET_OBJECTS:RTUbsan.${arch}>
41+
ADDITIONAL_HEADERS ${NSAN_HEADERS}
42+
CFLAGS ${NSAN_CFLAGS}
43+
PARENT_TARGET nsan
44+
)
45+
endforeach()
46+
47+
add_compiler_rt_object_libraries(RTNsan
48+
ARCHS ${NSAN_SUPPORTED_ARCH}
49+
SOURCES ${NSAN_SOURCES}
50+
ADDITIONAL_HEADERS ${NSAN_HEADERS}
51+
CFLAGS ${NSAN_CFLAGS})
52+
endif()
5153

5254
if(COMPILER_RT_INCLUDE_TESTS)
5355
add_subdirectory(tests)

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

Lines changed: 48 additions & 46 deletions
Original file line numberDiff line numberDiff line change
@@ -195,58 +195,60 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCHES "mips|mips64|mipsel|mips64el")
195195
list(APPEND SCUDO_LINK_LIBS atomic)
196196
endif()
197197

198-
add_compiler_rt_object_libraries(RTScudoStandalone
199-
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
200-
SOURCES ${SCUDO_SOURCES}
201-
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
202-
CFLAGS ${SCUDO_CFLAGS}
203-
DEPS ${SCUDO_DEPS})
204-
add_compiler_rt_object_libraries(RTScudoStandaloneCWrappers
205-
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
206-
SOURCES ${SCUDO_SOURCES_C_WRAPPERS}
207-
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
208-
CFLAGS ${SCUDO_CFLAGS}
209-
DEPS ${SCUDO_DEPS})
210-
add_compiler_rt_object_libraries(RTScudoStandaloneCxxWrappers
211-
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
212-
SOURCES ${SCUDO_SOURCES_CXX_WRAPPERS}
213-
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
214-
CFLAGS ${SCUDO_CFLAGS}
215-
DEPS ${SCUDO_DEPS})
216-
217-
add_compiler_rt_runtime(clang_rt.scudo_standalone
218-
STATIC
219-
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
220-
SOURCES ${SCUDO_SOURCES} ${SCUDO_SOURCES_C_WRAPPERS}
221-
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
222-
CFLAGS ${SCUDO_CFLAGS}
223-
DEPS ${SCUDO_DEPS}
224-
OBJECT_LIBS ${SCUDO_OBJECT_LIBS}
225-
PARENT_TARGET scudo_standalone)
226-
add_compiler_rt_runtime(clang_rt.scudo_standalone_cxx
227-
STATIC
228-
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
229-
SOURCES ${SCUDO_SOURCES_CXX_WRAPPERS}
230-
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
231-
CFLAGS ${SCUDO_CFLAGS}
232-
DEPS ${SCUDO_DEPS}
233-
PARENT_TARGET scudo_standalone)
234-
235-
if(COMPILER_RT_SCUDO_STANDALONE_BUILD_SHARED)
198+
if(COMPILER_RT_HAS_SCUDO_STANDALONE)
199+
add_compiler_rt_object_libraries(RTScudoStandalone
200+
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
201+
SOURCES ${SCUDO_SOURCES}
202+
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
203+
CFLAGS ${SCUDO_CFLAGS}
204+
DEPS ${SCUDO_DEPS})
205+
add_compiler_rt_object_libraries(RTScudoStandaloneCWrappers
206+
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
207+
SOURCES ${SCUDO_SOURCES_C_WRAPPERS}
208+
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
209+
CFLAGS ${SCUDO_CFLAGS}
210+
DEPS ${SCUDO_DEPS})
211+
add_compiler_rt_object_libraries(RTScudoStandaloneCxxWrappers
212+
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
213+
SOURCES ${SCUDO_SOURCES_CXX_WRAPPERS}
214+
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
215+
CFLAGS ${SCUDO_CFLAGS}
216+
DEPS ${SCUDO_DEPS})
217+
236218
add_compiler_rt_runtime(clang_rt.scudo_standalone
237-
SHARED
219+
STATIC
238220
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
239-
SOURCES ${SCUDO_SOURCES} ${SCUDO_SOURCES_C_WRAPPERS} ${SCUDO_SOURCES_CXX_WRAPPERS}
221+
SOURCES ${SCUDO_SOURCES} ${SCUDO_SOURCES_C_WRAPPERS}
240222
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
241223
CFLAGS ${SCUDO_CFLAGS}
242224
DEPS ${SCUDO_DEPS}
243225
OBJECT_LIBS ${SCUDO_OBJECT_LIBS}
244-
LINK_FLAGS ${SCUDO_LINK_FLAGS}
245-
LINK_LIBS ${SCUDO_LINK_LIBS}
246226
PARENT_TARGET scudo_standalone)
247-
endif()
227+
add_compiler_rt_runtime(clang_rt.scudo_standalone_cxx
228+
STATIC
229+
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
230+
SOURCES ${SCUDO_SOURCES_CXX_WRAPPERS}
231+
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
232+
CFLAGS ${SCUDO_CFLAGS}
233+
DEPS ${SCUDO_DEPS}
234+
PARENT_TARGET scudo_standalone)
235+
236+
if(COMPILER_RT_SCUDO_STANDALONE_BUILD_SHARED)
237+
add_compiler_rt_runtime(clang_rt.scudo_standalone
238+
SHARED
239+
ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
240+
SOURCES ${SCUDO_SOURCES} ${SCUDO_SOURCES_C_WRAPPERS} ${SCUDO_SOURCES_CXX_WRAPPERS}
241+
ADDITIONAL_HEADERS ${SCUDO_HEADERS}
242+
CFLAGS ${SCUDO_CFLAGS}
243+
DEPS ${SCUDO_DEPS}
244+
OBJECT_LIBS ${SCUDO_OBJECT_LIBS}
245+
LINK_FLAGS ${SCUDO_LINK_FLAGS}
246+
LINK_LIBS ${SCUDO_LINK_LIBS}
247+
PARENT_TARGET scudo_standalone)
248+
endif()
248249

249-
add_subdirectory(benchmarks)
250-
if(COMPILER_RT_INCLUDE_TESTS)
251-
add_subdirectory(tests)
250+
add_subdirectory(benchmarks)
251+
if(COMPILER_RT_INCLUDE_TESTS)
252+
add_subdirectory(tests)
253+
endif()
252254
endif()

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

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -66,25 +66,27 @@ macro(add_scudo_unittest testname)
6666
RTGwpAsan RTGwpAsanBacktraceLibc RTGwpAsanSegvHandler)
6767
endif()
6868

69-
foreach(arch ${SCUDO_TEST_ARCH})
70-
# Additional runtime objects get added along RTScudoStandalone
71-
set(SCUDO_TEST_RTOBJECTS $<TARGET_OBJECTS:RTScudoStandalone.${arch}>)
72-
foreach(rtobject ${TEST_ADDITIONAL_RTOBJECTS})
73-
list(APPEND SCUDO_TEST_RTOBJECTS $<TARGET_OBJECTS:${rtobject}.${arch}>)
69+
if(COMPILER_RT_HAS_SCUDO_STANDALONE)
70+
foreach(arch ${SCUDO_TEST_ARCH})
71+
# Additional runtime objects get added along RTScudoStandalone
72+
set(SCUDO_TEST_RTOBJECTS $<TARGET_OBJECTS:RTScudoStandalone.${arch}>)
73+
foreach(rtobject ${TEST_ADDITIONAL_RTOBJECTS})
74+
list(APPEND SCUDO_TEST_RTOBJECTS $<TARGET_OBJECTS:${rtobject}.${arch}>)
75+
endforeach()
76+
# Add the static runtime library made of all the runtime objects
77+
set(RUNTIME RT${testname}.${arch})
78+
add_library(${RUNTIME} STATIC ${SCUDO_TEST_RTOBJECTS})
79+
set(ScudoUnitTestsObjects)
80+
generate_compiler_rt_tests(ScudoUnitTestsObjects ScudoUnitTests
81+
"${testname}-${arch}-Test" ${arch}
82+
SOURCES ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE}
83+
COMPILE_DEPS ${SCUDO_TEST_HEADERS}
84+
DEPS scudo_standalone
85+
RUNTIME ${RUNTIME}
86+
CFLAGS ${SCUDO_UNITTEST_CFLAGS}
87+
LINK_FLAGS ${SCUDO_UNITTEST_LINK_FLAGS})
7488
endforeach()
75-
# Add the static runtime library made of all the runtime objects
76-
set(RUNTIME RT${testname}.${arch})
77-
add_library(${RUNTIME} STATIC ${SCUDO_TEST_RTOBJECTS})
78-
set(ScudoUnitTestsObjects)
79-
generate_compiler_rt_tests(ScudoUnitTestsObjects ScudoUnitTests
80-
"${testname}-${arch}-Test" ${arch}
81-
SOURCES ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE}
82-
COMPILE_DEPS ${SCUDO_TEST_HEADERS}
83-
DEPS scudo_standalone
84-
RUNTIME ${RUNTIME}
85-
CFLAGS ${SCUDO_UNITTEST_CFLAGS}
86-
LINK_FLAGS ${SCUDO_UNITTEST_LINK_FLAGS})
87-
endforeach()
89+
endif()
8890
endmacro()
8991

9092
set(SCUDO_UNIT_TEST_SOURCES

0 commit comments

Comments
 (0)