@@ -195,60 +195,58 @@ if(COMPILER_RT_DEFAULT_TARGET_ARCH MATCHES "mips|mips64|mipsel|mips64el")
195195 list (APPEND SCUDO_LINK_LIBS atomic)
196196endif ()
197197
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-
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)
218236 add_compiler_rt_runtime(clang_rt.scudo_standalone
219- STATIC
237+ SHARED
220238 ARCHS ${SCUDO_STANDALONE_SUPPORTED_ARCH}
221- SOURCES ${SCUDO_SOURCES} ${SCUDO_SOURCES_C_WRAPPERS}
239+ SOURCES ${SCUDO_SOURCES} ${SCUDO_SOURCES_C_WRAPPERS} ${SCUDO_SOURCES_CXX_WRAPPERS}
222240 ADDITIONAL_HEADERS ${SCUDO_HEADERS}
223241 CFLAGS ${SCUDO_CFLAGS}
224242 DEPS ${SCUDO_DEPS}
225243 OBJECT_LIBS ${SCUDO_OBJECT_LIBS}
244+ LINK_FLAGS ${SCUDO_LINK_FLAGS}
245+ LINK_LIBS ${SCUDO_LINK_LIBS}
226246 PARENT_TARGET scudo_standalone)
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 ()
247+ endif ()
249248
250- add_subdirectory (benchmarks)
251- if (COMPILER_RT_INCLUDE_TESTS)
252- add_subdirectory (tests)
253- endif ()
249+ add_subdirectory (benchmarks)
250+ if (COMPILER_RT_INCLUDE_TESTS)
251+ add_subdirectory (tests)
254252endif ()
0 commit comments