Skip to content

Commit 7af0a1c

Browse files
filcabfilcab
committedJun 19, 2015
CMake: Stop using LLVM's custom parse_arguments. NFC
Summary: Use CMake's cmake_parse_arguments() instead. It's called in a slightly different way, but supports all our use cases. It's in CMake 2.8.8, which is our minimum supported version. CMake 3.0 doc (roughly the same. No direct link to 2.8.8 doc): http://www.cmake.org/cmake/help/v3.0/module/CMakeParseArguments.html?highlight=cmake_parse_arguments Since I was already changing these calls, I changed ARCH and LIB into ARCHS and LIBS to make it more clear that they're lists of arguments. Reviewers: eugenis, samsonov, beanz Subscribers: llvm-commits Differential Revision: http://reviews.llvm.org/D10529 llvm-svn: 240120
1 parent e7e628c commit 7af0a1c

File tree

14 files changed

+43
-50
lines changed

14 files changed

+43
-50
lines changed
 

‎compiler-rt/cmake/Modules/AddCompilerRT.cmake

+14-15
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,18 @@
11
include(AddLLVM)
22
include(ExternalProject)
3-
include(LLVMParseArguments)
43
include(CompilerRTUtils)
54

65
# Tries to add an "object library" target for a given list of OSs and/or
76
# architectures with name "<name>.<arch>" for non-Darwin platforms if
87
# architecture can be targeted, and "<name>.<os>" for Darwin platforms.
98
# add_compiler_rt_object_libraries(<name>
10-
# OS <os>
11-
# ARCH <arch>
9+
# OS <os names>
10+
# ARCHS <architectures>
1211
# SOURCES <source files>
1312
# CFLAGS <compile flags>
1413
# DEFS <compile definitions>)
1514
function(add_compiler_rt_object_libraries name)
16-
parse_arguments(LIB "OS;ARCH;SOURCES;CFLAGS;DEFS" "" ${ARGN})
15+
cmake_parse_arguments(LIB "" "" "OS;ARCHS;SOURCES;CFLAGS;DEFS" ${ARGN})
1716
set(libnames)
1817
if(APPLE)
1918
foreach(os ${LIB_OS})
@@ -22,7 +21,7 @@ function(add_compiler_rt_object_libraries name)
2221
set(extra_cflags_${libname} ${DARWIN_${os}_CFLAGS})
2322
endforeach()
2423
else()
25-
foreach(arch ${LIB_ARCH})
24+
foreach(arch ${LIB_ARCHS})
2625
set(libname "${name}.${arch}")
2726
set(libnames ${libnames} ${libname})
2827
set(extra_cflags_${libname} ${TARGET_${arch}_CFLAGS})
@@ -40,7 +39,7 @@ function(add_compiler_rt_object_libraries name)
4039
set_property(TARGET ${libname} APPEND PROPERTY
4140
COMPILE_DEFINITIONS ${LIB_DEFS})
4241
if(APPLE)
43-
set_target_properties(${libname} PROPERTIES OSX_ARCHITECTURES "${LIB_ARCH}")
42+
set_target_properties(${libname} PROPERTIES OSX_ARCHITECTURES "${LIB_ARCHS}")
4443
endif()
4544
endforeach()
4645
endfunction()
@@ -54,7 +53,7 @@ endfunction()
5453
# OUTPUT_NAME <output library name>)
5554
macro(add_compiler_rt_runtime name arch type)
5655
if(CAN_TARGET_${arch})
57-
parse_arguments(LIB "SOURCES;CFLAGS;LINKFLAGS;DEFS;OUTPUT_NAME" "" ${ARGN})
56+
cmake_parse_arguments(LIB "" "OUTPUT_NAME" "SOURCES;CFLAGS;LINKFLAGS;DEFS" ${ARGN})
5857
add_library(${name} ${type} ${LIB_SOURCES})
5958
# Setup compile flags and definitions.
6059
set_target_compile_flags(${name}
@@ -87,18 +86,18 @@ endmacro()
8786

8887
# Same as add_compiler_rt_runtime(... STATIC), but creates a universal library
8988
# for several architectures.
90-
# add_compiler_rt_osx_static_runtime(<name> ARCH <architectures>
89+
# add_compiler_rt_osx_static_runtime(<name> ARCHS <architectures>
9190
# SOURCES <source files>
9291
# CFLAGS <compile flags>
9392
# DEFS <compile definitions>)
9493
macro(add_compiler_rt_osx_static_runtime name)
95-
parse_arguments(LIB "ARCH;SOURCES;CFLAGS;DEFS" "" ${ARGN})
94+
cmake_parse_arguments(LIB "" "" "ARCHS;SOURCES;CFLAGS;DEFS" ${ARGN})
9695
add_library(${name} STATIC ${LIB_SOURCES})
9796
set_target_compile_flags(${name} ${LIB_CFLAGS})
9897
set_property(TARGET ${name} APPEND PROPERTY
9998
COMPILE_DEFINITIONS ${LIB_DEFS})
10099
set_target_properties(${name} PROPERTIES
101-
OSX_ARCHITECTURES "${LIB_ARCH}"
100+
OSX_ARCHITECTURES "${LIB_ARCHS}"
102101
ARCHIVE_OUTPUT_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR})
103102
install(TARGETS ${name}
104103
ARCHIVE DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR})
@@ -107,20 +106,20 @@ endmacro()
107106
# Adds dynamic runtime library on osx/iossim, which supports multiple
108107
# architectures.
109108
# add_compiler_rt_darwin_dynamic_runtime(<name> <os>
110-
# ARCH <architectures>
109+
# ARCHS <architectures>
111110
# SOURCES <source files>
112111
# CFLAGS <compile flags>
113112
# DEFS <compile definitions>
114113
# LINKFLAGS <link flags>)
115114
macro(add_compiler_rt_darwin_dynamic_runtime name os)
116-
parse_arguments(LIB "ARCH;SOURCES;CFLAGS;DEFS;LINKFLAGS" "" ${ARGN})
115+
cmake_parse_arguments(LIB "" "" "ARCHS;SOURCES;CFLAGS;DEFS;LINKFLAGS" ${ARGN})
117116
add_library(${name} SHARED ${LIB_SOURCES})
118117
set_target_compile_flags(${name} ${LIB_CFLAGS} ${DARWIN_${os}_CFLAGS})
119118
set_target_link_flags(${name} ${LIB_LINKFLAGS} ${DARWIN_${os}_LINKFLAGS})
120119
set_property(TARGET ${name} APPEND PROPERTY
121120
COMPILE_DEFINITIONS ${LIB_DEFS})
122121
set_target_properties(${name} PROPERTIES
123-
OSX_ARCHITECTURES "${LIB_ARCH}"
122+
OSX_ARCHITECTURES "${LIB_ARCHS}"
124123
LIBRARY_OUTPUT_DIRECTORY ${COMPILER_RT_LIBRARY_OUTPUT_DIR})
125124
install(TARGETS ${name}
126125
LIBRARY DESTINATION ${COMPILER_RT_LIBRARY_INSTALL_DIR})
@@ -169,7 +168,7 @@ endif()
169168
# DEPS <deps (e.g. runtime libs)>
170169
# LINK_FLAGS <link flags>)
171170
macro(add_compiler_rt_test test_suite test_name)
172-
parse_arguments(TEST "SUBDIR;OBJECTS;DEPS;LINK_FLAGS" "" ${ARGN})
171+
cmake_parse_arguments(TEST "" "SUBDIR" "OBJECTS;DEPS;LINK_FLAGS" "" ${ARGN})
173172
if(TEST_SUBDIR)
174173
set(output_bin "${CMAKE_CURRENT_BINARY_DIR}/${TEST_SUBDIR}/${test_name}")
175174
else()
@@ -236,7 +235,7 @@ macro(add_custom_libcxx name prefix)
236235
message(FATAL_ERROR "libcxx not found!")
237236
endif()
238237

239-
parse_arguments(LIBCXX "DEPS;CFLAGS" "" ${ARGN})
238+
cmake_parse_arguments(LIBCXX "" "" "DEPS;CFLAGS" ${ARGN})
240239
foreach(flag ${LIBCXX_CFLAGS})
241240
set(flagstr "${flagstr} ${flag}")
242241
endforeach()

‎compiler-rt/cmake/Modules/CompilerRTCompile.cmake

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(LLVMParseArguments)
2-
31
# On Windows, CMAKE_*_FLAGS are built for MSVC but we use the GCC clang.exe,
42
# which uses completely different flags. Translate some common flag types, and
53
# drop the rest.
@@ -32,7 +30,7 @@ endfunction()
3230
# CFLAGS <list of compile flags>
3331
# DEPS <list of dependencies>)
3432
macro(clang_compile object_file source)
35-
parse_arguments(SOURCE "CFLAGS;DEPS" "" ${ARGN})
33+
cmake_parse_arguments(SOURCE "" "" "CFLAGS;DEPS" ${ARGN})
3634
get_filename_component(source_rpath ${source} REALPATH)
3735
if(NOT COMPILER_RT_STANDALONE_BUILD)
3836
list(APPEND SOURCE_DEPS clang compiler-rt-headers)

‎compiler-rt/cmake/Modules/CompilerRTLink.cmake

+1-3
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,10 @@
1-
include(LLVMParseArguments)
2-
31
# Link a shared library with COMPILER_RT_TEST_COMPILER.
42
# clang_link_shared(<output.so>
53
# OBJECTS <list of input objects>
64
# LINKFLAGS <list of link flags>
75
# DEPS <list of dependencies>)
86
macro(clang_link_shared so_file)
9-
parse_arguments(SOURCE "OBJECTS;LINKFLAGS;DEPS" "" ${ARGN})
7+
cmake_parse_arguments(SOURCE "" "" "OBJECTS;LINKFLAGS;DEPS" ${ARGN})
108
if(NOT COMPILER_RT_STANDALONE_BUILD)
119
list(APPEND SOURCE_DEPS clang)
1210
endif()

‎compiler-rt/cmake/Modules/SanitizerUtils.cmake

+3-5
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
include(LLVMParseArguments)
2-
31
set(SANITIZER_GEN_DYNAMIC_LIST
42
${COMPILER_RT_SOURCE_DIR}/lib/sanitizer_common/scripts/gen_dynamic_list.py)
53

@@ -50,19 +48,19 @@ endmacro()
5048

5149
macro(add_sanitizer_rt_version_list name)
5250
set(vers ${CMAKE_CURRENT_BINARY_DIR}/${name}.vers)
53-
parse_arguments(ARG "LIB;EXTRA" "" ${ARGN})
51+
cmake_parse_arguments(ARG "" "" "LIBS;EXTRA" ${ARGN})
5452
set(args)
5553
foreach(arg ${ARG_EXTRA})
5654
list(APPEND args "--extra" ${arg})
5755
endforeach()
58-
foreach(arg ${ARG_LIB})
56+
foreach(arg ${ARG_LIBS})
5957
list(APPEND args "$<TARGET_FILE:${arg}>")
6058
endforeach()
6159
add_custom_command(OUTPUT ${vers}
6260
COMMAND ${PYTHON_EXECUTABLE}
6361
${SANITIZER_GEN_DYNAMIC_LIST} --version-list ${args}
6462
> ${vers}
65-
DEPENDS ${SANITIZER_GEN_DYNAMIC_LIST} ${ARG_EXTRA} ${ARG_LIB}
63+
DEPENDS ${SANITIZER_GEN_DYNAMIC_LIST} ${ARG_EXTRA} ${ARG_LIBS}
6664
WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
6765
COMMENT "Generating version list for ${name}"
6866
VERBATIM)

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

+8-8
Original file line numberDiff line numberDiff line change
@@ -77,32 +77,32 @@ append_list_if(ANDROID log ASAN_DYNAMIC_LIBS)
7777
if(APPLE)
7878
add_compiler_rt_object_libraries(RTAsan
7979
OS ${SANITIZER_COMMON_SUPPORTED_OS}
80-
ARCH ${ASAN_SUPPORTED_ARCH}
80+
ARCHS ${ASAN_SUPPORTED_ARCH}
8181
SOURCES ${ASAN_SOURCES} ${ASAN_CXX_SOURCES}
8282
CFLAGS ${ASAN_DYNAMIC_CFLAGS}
8383
DEFS ${ASAN_DYNAMIC_DEFINITIONS})
8484
else()
8585
add_compiler_rt_object_libraries(RTAsan
86-
ARCH ${ASAN_SUPPORTED_ARCH}
86+
ARCHS ${ASAN_SUPPORTED_ARCH}
8787
SOURCES ${ASAN_SOURCES} CFLAGS ${ASAN_CFLAGS}
8888
DEFS ${ASAN_COMMON_DEFINITIONS})
8989
add_compiler_rt_object_libraries(RTAsan_cxx
90-
ARCH ${ASAN_SUPPORTED_ARCH}
90+
ARCHS ${ASAN_SUPPORTED_ARCH}
9191
SOURCES ${ASAN_CXX_SOURCES} CFLAGS ${ASAN_CFLAGS}
9292
DEFS ${ASAN_COMMON_DEFINITIONS})
9393
add_compiler_rt_object_libraries(RTAsan_preinit
94-
ARCH ${ASAN_SUPPORTED_ARCH}
94+
ARCHS ${ASAN_SUPPORTED_ARCH}
9595
SOURCES ${ASAN_PREINIT_SOURCES} CFLAGS ${ASAN_CFLAGS}
9696
DEFS ${ASAN_COMMON_DEFINITIONS})
9797
add_compiler_rt_object_libraries(RTAsan_dynamic
98-
ARCH ${ASAN_SUPPORTED_ARCH}
98+
ARCHS ${ASAN_SUPPORTED_ARCH}
9999
SOURCES ${ASAN_SOURCES} ${ASAN_CXX_SOURCES}
100100
CFLAGS ${ASAN_DYNAMIC_CFLAGS}
101101
DEFS ${ASAN_DYNAMIC_DEFINITIONS})
102102

103103
file(WRITE ${CMAKE_CURRENT_BINARY_DIR}/dummy.cc "")
104104
add_compiler_rt_object_libraries(RTAsan_dynamic_version_script_dummy
105-
ARCH ${ASAN_SUPPORTED_ARCH}
105+
ARCHS ${ASAN_SUPPORTED_ARCH}
106106
SOURCES ${CMAKE_CURRENT_BINARY_DIR}/dummy.cc
107107
CFLAGS ${ASAN_DYNAMIC_CFLAGS}
108108
DEFS ${ASAN_DYNAMIC_DEFINITIONS})
@@ -113,7 +113,7 @@ add_custom_target(asan)
113113
if(APPLE)
114114
foreach (os ${SANITIZER_COMMON_SUPPORTED_OS})
115115
add_compiler_rt_darwin_dynamic_runtime(clang_rt.asan_${os}_dynamic ${os}
116-
ARCH ${ASAN_SUPPORTED_ARCH}
116+
ARCHS ${ASAN_SUPPORTED_ARCH}
117117
SOURCES $<TARGET_OBJECTS:RTAsan.${os}>
118118
$<TARGET_OBJECTS:RTInterception.${os}>
119119
$<TARGET_OBJECTS:RTSanitizerCommon.${os}>
@@ -156,7 +156,7 @@ else()
156156

157157
if (UNIX AND NOT ${arch} MATCHES "i386|i686")
158158
add_sanitizer_rt_version_list(clang_rt.asan-dynamic-${arch}
159-
LIB clang_rt.asan-${arch} clang_rt.asan_cxx-${arch}
159+
LIBS clang_rt.asan-${arch} clang_rt.asan_cxx-${arch}
160160
EXTRA asan.syms.extra)
161161
set(VERSION_SCRIPT_FLAG
162162
-Wl,--version-script,${CMAKE_CURRENT_BINARY_DIR}/clang_rt.asan-dynamic-${arch}.vers)

‎compiler-rt/lib/asan/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ endmacro()
129129
# Link ASan unit test for a given architecture from a set
130130
# of objects in with given linker flags.
131131
macro(add_asan_test test_suite test_name arch kind)
132-
parse_arguments(TEST "OBJECTS;LINKFLAGS;SUBDIR" "WITH_TEST_RUNTIME" ${ARGN})
132+
cmake_parse_arguments(TEST "WITH_TEST_RUNTIME" "" "OBJECTS;LINKFLAGS;SUBDIR" ${ARGN})
133133
get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
134134
set(TEST_DEPS ${TEST_OBJECTS})
135135
if(NOT COMPILER_RT_STANDALONE_BUILD)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,6 @@ append_no_rtti_flag(INTERCEPTION_CFLAGS)
1414

1515
add_compiler_rt_object_libraries(RTInterception
1616
OS ${SANITIZER_COMMON_SUPPORTED_OS}
17-
ARCH ${SANITIZER_COMMON_SUPPORTED_ARCH}
17+
ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}
1818
SOURCES ${INTERCEPTION_SOURCES}
1919
CFLAGS ${INTERCEPTION_CFLAGS})

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ add_custom_target(lsan)
2020

2121
add_compiler_rt_object_libraries(RTLSanCommon
2222
OS ${SANITIZER_COMMON_SUPPORTED_OS}
23-
ARCH ${LSAN_COMMON_SUPPORTED_ARCH}
23+
ARCHS ${LSAN_COMMON_SUPPORTED_ARCH}
2424
SOURCES ${LSAN_COMMON_SOURCES}
2525
CFLAGS ${LSAN_CFLAGS})
2626

‎compiler-rt/lib/msan/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ macro(msan_compile obj_list source arch kind)
7171
endmacro()
7272

7373
macro(msan_link_shared so_list so_name arch kind)
74-
parse_arguments(SOURCE "OBJECTS;LINKFLAGS;DEPS" "" ${ARGN})
74+
cmake_parse_arguments(SOURCE "" "" "OBJECTS;LINKFLAGS;DEPS" ${ARGN})
7575
set(output_so "${CMAKE_CURRENT_BINARY_DIR}/${so_name}.${arch}${kind}.so")
7676
get_target_flags_for_arch(${arch} TARGET_LINKFLAGS)
7777
if(NOT COMPILER_RT_STANDALONE_BUILD)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ set(PROFILE_SOURCES
1111

1212
if(APPLE)
1313
add_compiler_rt_osx_static_runtime(clang_rt.profile_osx
14-
ARCH ${PROFILE_SUPPORTED_ARCH}
14+
ARCHS ${PROFILE_SUPPORTED_ARCH}
1515
SOURCES ${PROFILE_SOURCES})
1616
add_dependencies(profile clang_rt.profile_osx)
1717
else()

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -131,7 +131,7 @@ if(APPLE)
131131

132132
add_compiler_rt_object_libraries(RTSanitizerCommon
133133
OS ${SANITIZER_COMMON_SUPPORTED_OS}
134-
ARCH ${SANITIZER_COMMON_SUPPORTED_ARCH}
134+
ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}
135135
SOURCES ${SANITIZER_SOURCES} ${SANITIZER_LIBCDEP_SOURCES}
136136
CFLAGS ${SANITIZER_CFLAGS}
137137
DEFS ${SANITIZER_COMMON_DEFINITIONS})
@@ -142,11 +142,11 @@ else()
142142
# Otherwise, build separate libraries for each target.
143143

144144
add_compiler_rt_object_libraries(RTSanitizerCommon
145-
ARCH ${SANITIZER_COMMON_SUPPORTED_ARCH}
145+
ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}
146146
SOURCES ${SANITIZER_SOURCES} CFLAGS ${SANITIZER_CFLAGS}
147147
DEFS ${SANITIZER_COMMON_DEFINITIONS})
148148
add_compiler_rt_object_libraries(RTSanitizerCommonLibc
149-
ARCH ${SANITIZER_COMMON_SUPPORTED_ARCH}
149+
ARCHS ${SANITIZER_COMMON_SUPPORTED_ARCH}
150150
SOURCES ${SANITIZER_LIBCDEP_SOURCES} CFLAGS ${SANITIZER_CFLAGS}
151151
DEFS ${SANITIZER_COMMON_DEFINITIONS})
152152
foreach(arch ${SANITIZER_COMMON_SUPPORTED_ARCH})

‎compiler-rt/lib/tsan/dd/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ if(CAN_TARGET_x86_64 AND UNIX AND NOT APPLE AND NOT ANDROID)
2828
add_dependencies(dd clang_rt.dd-${arch})
2929

3030
add_compiler_rt_object_libraries(RTDD
31-
ARCH ${arch}
31+
ARCHS ${arch}
3232
SOURCES ${DD_SOURCES} CFLAGS ${DD_CFLAGS})
3333

3434
add_compiler_rt_runtime(clang_rt.dyndd-${arch} ${arch} SHARED

‎compiler-rt/lib/tsan/tests/CMakeLists.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ macro(add_tsan_unittest testname)
3636
# Build unit tests only for 64-bit Linux.
3737
if(UNIX AND NOT APPLE)
3838
foreach(arch ${TSAN_SUPPORTED_ARCH})
39-
parse_arguments(TEST "SOURCES;HEADERS" "" ${ARGN})
39+
cmake_parse_arguments(TEST "" "" "SOURCES;HEADERS" ${ARGN})
4040
set(TEST_OBJECTS)
4141
foreach(SOURCE ${TEST_SOURCES} ${COMPILER_RT_GTEST_SOURCE})
4242
tsan_compile(TEST_OBJECTS ${SOURCE} ${arch} ${TEST_HEADERS})

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -31,20 +31,20 @@ if(APPLE)
3131
# Common parts of UBSan runtime.
3232
add_compiler_rt_object_libraries(RTUbsan
3333
OS ${SANITIZER_COMMON_SUPPORTED_OS}
34-
ARCH ${UBSAN_COMMON_SUPPORTED_ARCH}
34+
ARCHS ${UBSAN_COMMON_SUPPORTED_ARCH}
3535
SOURCES ${UBSAN_SOURCES} ${UBSAN_CXX_SOURCES}
3636
CFLAGS ${UBSAN_CXXFLAGS})
3737

3838
if(COMPILER_RT_HAS_UBSAN)
3939
# Initializer of standalone UBSan runtime.
4040
add_compiler_rt_object_libraries(RTUbsan_standalone
4141
OS ${SANITIZER_COMMON_SUPPORTED_OS}
42-
ARCH ${UBSAN_SUPPORTED_ARCH}
42+
ARCHS ${UBSAN_SUPPORTED_ARCH}
4343
SOURCES ${UBSAN_STANDALONE_SOURCES}
4444
CFLAGS ${UBSAN_STANDALONE_CFLAGS})
4545
foreach(os ${SANITIZER_COMMON_SUPPORTED_OS})
4646
add_compiler_rt_darwin_dynamic_runtime(clang_rt.ubsan_${os}_dynamic ${os}
47-
ARCH ${UBSAN_SUPPORTED_ARCH}
47+
ARCHS ${UBSAN_SUPPORTED_ARCH}
4848
SOURCES $<TARGET_OBJECTS:RTUbsan.${os}>
4949
$<TARGET_OBJECTS:RTUbsan_standalone.${os}>
5050
$<TARGET_OBJECTS:RTSanitizerCommon.${os}>)
@@ -56,17 +56,17 @@ if(APPLE)
5656
else()
5757
# Common parts of UBSan runtime.
5858
add_compiler_rt_object_libraries(RTUbsan
59-
ARCH ${UBSAN_COMMON_SUPPORTED_ARCH}
59+
ARCHS ${UBSAN_COMMON_SUPPORTED_ARCH}
6060
SOURCES ${UBSAN_SOURCES} CFLAGS ${UBSAN_CFLAGS})
6161
# C++-specific parts of UBSan runtime. Requires a C++ ABI library.
6262
add_compiler_rt_object_libraries(RTUbsan_cxx
63-
ARCH ${UBSAN_COMMON_SUPPORTED_ARCH}
63+
ARCHS ${UBSAN_COMMON_SUPPORTED_ARCH}
6464
SOURCES ${UBSAN_CXX_SOURCES} CFLAGS ${UBSAN_CXXFLAGS})
6565

6666
if(COMPILER_RT_HAS_UBSAN)
6767
# Initializer of standalone UBSan runtime.
6868
add_compiler_rt_object_libraries(RTUbsan_standalone
69-
ARCH ${UBSAN_SUPPORTED_ARCH}
69+
ARCHS ${UBSAN_SUPPORTED_ARCH}
7070
SOURCES ${UBSAN_STANDALONE_SOURCES} CFLAGS ${UBSAN_STANDALONE_CFLAGS})
7171

7272
foreach(arch ${UBSAN_SUPPORTED_ARCH})

0 commit comments

Comments
 (0)
Please sign in to comment.