Skip to content

Commit 17781c7

Browse files
fjriccifjricci
committed
Make cmake link flag naming consistent
Summary: The build system was inconsistent in its naming conventions for link flags. This patch changes all uses of LINKFLAGS to LINK_FLAGS, for consistency with cmake's LINK_FLAGS property. This patch should make it easier to search the source code for uses of link flags, as well as providing the benefit of improved style and consistency. Reviewers: compnerd, beanz Subscribers: kubabrecka, llvm-commits, mgorny Differential Revision: https://reviews.llvm.org/D28506 llvm-svn: 291539
1 parent 4ebc79b commit 17781c7

16 files changed

+90
-90
lines changed

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

+6-6
Original file line numberDiff line numberDiff line change
@@ -94,7 +94,7 @@ endfunction()
9494
# OS <os list>
9595
# SOURCES <source files>
9696
# CFLAGS <compile flags>
97-
# LINKFLAGS <linker flags>
97+
# LINK_FLAGS <linker flags>
9898
# DEFS <compile definitions>
9999
# LINK_LIBS <linked libraries> (only for shared library)
100100
# OBJECT_LIBS <object libraries to use as sources>
@@ -107,7 +107,7 @@ function(add_compiler_rt_runtime name type)
107107
cmake_parse_arguments(LIB
108108
""
109109
"PARENT_TARGET"
110-
"OS;ARCHS;SOURCES;CFLAGS;LINKFLAGS;DEFS;LINK_LIBS;OBJECT_LIBS"
110+
"OS;ARCHS;SOURCES;CFLAGS;LINK_FLAGS;DEFS;LINK_LIBS;OBJECT_LIBS"
111111
${ARGN})
112112
set(libnames)
113113
if(APPLE)
@@ -116,7 +116,7 @@ function(add_compiler_rt_runtime name type)
116116
set(libname "${name}_${os}")
117117
else()
118118
set(libname "${name}_${os}_dynamic")
119-
set(extra_linkflags_${libname} ${DARWIN_${os}_LINKFLAGS} ${LIB_LINKFLAGS})
119+
set(extra_link_flags_${libname} ${DARWIN_${os}_LINK_FLAGS} ${LIB_LINK_FLAGS})
120120
endif()
121121
list_intersect(LIB_ARCHS_${libname} DARWIN_${os}_ARCHS LIB_ARCHS)
122122
if(LIB_ARCHS_${libname})
@@ -139,7 +139,7 @@ function(add_compiler_rt_runtime name type)
139139
else()
140140
set(libname "${name}-dynamic-${arch}")
141141
set(extra_cflags_${libname} ${TARGET_${arch}_CFLAGS} ${LIB_CFLAGS})
142-
set(extra_linkflags_${libname} ${TARGET_${arch}_LINKFLAGS} ${LIB_LINKFLAGS})
142+
set(extra_link_flags_${libname} ${TARGET_${arch}_LINK_FLAGS} ${LIB_LINK_FLAGS})
143143
if(WIN32)
144144
set(output_name_${libname} ${name}_dynamic-${arch}${COMPILER_RT_OS_SUFFIX})
145145
else()
@@ -188,7 +188,7 @@ function(add_compiler_rt_runtime name type)
188188

189189
add_library(${libname} ${type} ${sources_${libname}})
190190
set_target_compile_flags(${libname} ${extra_cflags_${libname}})
191-
set_target_link_flags(${libname} ${extra_linkflags_${libname}})
191+
set_target_link_flags(${libname} ${extra_link_flags_${libname}})
192192
set_property(TARGET ${libname} APPEND PROPERTY
193193
COMPILE_DEFINITIONS ${LIB_DEFS})
194194
set_target_output_directories(${libname} ${COMPILER_RT_LIBRARY_OUTPUT_DIR})
@@ -243,7 +243,7 @@ endfunction()
243243
# when cross compiling, COMPILER_RT_TEST_COMPILER_CFLAGS help
244244
# in compilation and linking of unittests.
245245
string(REPLACE " " ";" COMPILER_RT_UNITTEST_CFLAGS "${COMPILER_RT_TEST_COMPILER_CFLAGS}")
246-
set(COMPILER_RT_UNITTEST_LINKFLAGS ${COMPILER_RT_UNITTEST_CFLAGS})
246+
set(COMPILER_RT_UNITTEST_LINK_FLAGS ${COMPILER_RT_UNITTEST_CFLAGS})
247247

248248
# Unittests support.
249249
set(COMPILER_RT_GTEST_PATH ${LLVM_MAIN_SRC_DIR}/utils/unittest/googletest)

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ function(darwin_test_archs os valid_archs)
6666
file(WRITE ${SIMPLE_C} "#include <stdio.h>\nint main() { printf(__FILE__); return 0; }\n")
6767

6868
set(os_linker_flags)
69-
foreach(flag ${DARWIN_${os}_LINKFLAGS})
69+
foreach(flag ${DARWIN_${os}_LINK_FLAGS})
7070
set(os_linker_flags "${os_linker_flags} ${flag}")
7171
endforeach()
7272
endif()

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,16 @@
11
# Link a shared library with COMPILER_RT_TEST_COMPILER.
22
# clang_link_shared(<output.so>
33
# OBJECTS <list of input objects>
4-
# LINKFLAGS <list of link flags>
4+
# LINK_FLAGS <list of link flags>
55
# DEPS <list of dependencies>)
66
macro(clang_link_shared so_file)
7-
cmake_parse_arguments(SOURCE "" "" "OBJECTS;LINKFLAGS;DEPS" ${ARGN})
7+
cmake_parse_arguments(SOURCE "" "" "OBJECTS;LINK_FLAGS;DEPS" ${ARGN})
88
if(NOT COMPILER_RT_STANDALONE_BUILD)
99
list(APPEND SOURCE_DEPS clang)
1010
endif()
1111
add_custom_command(
1212
OUTPUT ${so_file}
1313
COMMAND ${COMPILER_RT_TEST_COMPILER} -o "${so_file}" -shared
14-
${SOURCE_LINKFLAGS} ${SOURCE_OBJECTS}
14+
${SOURCE_LINK_FLAGS} ${SOURCE_OBJECTS}
1515
DEPENDS ${SOURCE_DEPS})
1616
endmacro()

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

+1-1
Original file line numberDiff line numberDiff line change
@@ -126,7 +126,7 @@ endfunction()
126126
# If successful, saves target flags for this architecture.
127127
macro(test_target_arch arch def)
128128
set(TARGET_${arch}_CFLAGS ${ARGN})
129-
set(TARGET_${arch}_LINKFLAGS ${ARGN})
129+
set(TARGET_${arch}_LINK_FLAGS ${ARGN})
130130
set(argstring "")
131131
foreach(arg ${ARGN})
132132
set(argstring "${argstring} ${arg}")

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

+4-4
Original file line numberDiff line numberDiff line change
@@ -48,13 +48,13 @@ endmacro()
4848

4949
# This function is only used on Darwin, where undefined symbols must be specified
5050
# in the linker invocation.
51-
function(add_weak_symbols libname linkflags)
51+
function(add_weak_symbols libname link_flags)
5252
file(STRINGS "${COMPILER_RT_SOURCE_DIR}/lib/${libname}/weak_symbols.txt" WEAK_SYMBOLS)
53-
set(local_linkflags ${${linkflags}})
53+
set(local_link_flags ${${link_flags}})
5454
foreach(SYMBOL ${WEAK_SYMBOLS})
55-
set(local_linkflags ${local_linkflags} -Wl,-U,${SYMBOL})
55+
set(local_link_flags ${local_link_flags} -Wl,-U,${SYMBOL})
5656
endforeach()
57-
set(${linkflags} ${local_linkflags} PARENT_SCOPE)
57+
set(${link_flags} ${local_link_flags} PARENT_SCOPE)
5858
endfunction()
5959

6060
macro(add_sanitizer_rt_version_list name)

‎compiler-rt/cmake/config-ix.cmake

+9-9
Original file line numberDiff line numberDiff line change
@@ -241,26 +241,26 @@ if(APPLE)
241241
set(CMAKE_OSX_DEPLOYMENT_TARGET "")
242242

243243
set(DARWIN_COMMON_CFLAGS -stdlib=libc++)
244-
set(DARWIN_COMMON_LINKFLAGS
244+
set(DARWIN_COMMON_LINK_FLAGS
245245
-stdlib=libc++
246246
-lc++
247247
-lc++abi)
248248

249249
check_linker_flag("-fapplication-extension" COMPILER_RT_HAS_APP_EXTENSION)
250250
if(COMPILER_RT_HAS_APP_EXTENSION)
251-
list(APPEND DARWIN_COMMON_LINKFLAGS "-fapplication-extension")
251+
list(APPEND DARWIN_COMMON_LINK_FLAGS "-fapplication-extension")
252252
endif()
253253

254254
set(DARWIN_osx_CFLAGS
255255
${DARWIN_COMMON_CFLAGS}
256256
-mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION})
257-
set(DARWIN_osx_LINKFLAGS
258-
${DARWIN_COMMON_LINKFLAGS}
257+
set(DARWIN_osx_LINK_FLAGS
258+
${DARWIN_COMMON_LINK_FLAGS}
259259
-mmacosx-version-min=${SANITIZER_MIN_OSX_VERSION})
260260

261261
if(DARWIN_osx_SYSROOT)
262262
list(APPEND DARWIN_osx_CFLAGS -isysroot ${DARWIN_osx_SYSROOT})
263-
list(APPEND DARWIN_osx_LINKFLAGS -isysroot ${DARWIN_osx_SYSROOT})
263+
list(APPEND DARWIN_osx_LINK_FLAGS -isysroot ${DARWIN_osx_SYSROOT})
264264
endif()
265265

266266
# Figure out which arches to use for each OS
@@ -283,8 +283,8 @@ if(APPLE)
283283
${DARWIN_COMMON_CFLAGS}
284284
${DARWIN_${platform}_SANITIZER_MIN_VER_FLAG}
285285
-isysroot ${DARWIN_${platform}sim_SYSROOT})
286-
set(DARWIN_${platform}sim_LINKFLAGS
287-
${DARWIN_COMMON_LINKFLAGS}
286+
set(DARWIN_${platform}sim_LINK_FLAGS
287+
${DARWIN_COMMON_LINK_FLAGS}
288288
${DARWIN_${platform}_SANITIZER_MIN_VER_FLAG}
289289
-isysroot ${DARWIN_${platform}sim_SYSROOT})
290290

@@ -311,8 +311,8 @@ if(APPLE)
311311
${DARWIN_COMMON_CFLAGS}
312312
${DARWIN_${platform}_SANITIZER_MIN_VER_FLAG}
313313
-isysroot ${DARWIN_${platform}_SYSROOT})
314-
set(DARWIN_${platform}_LINKFLAGS
315-
${DARWIN_COMMON_LINKFLAGS}
314+
set(DARWIN_${platform}_LINK_FLAGS
315+
${DARWIN_COMMON_LINK_FLAGS}
316316
${DARWIN_${platform}_SANITIZER_MIN_VER_FLAG}
317317
-isysroot ${DARWIN_${platform}_SYSROOT})
318318

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

+5-5
Original file line numberDiff line numberDiff line change
@@ -106,9 +106,9 @@ endif()
106106
add_compiler_rt_component(asan)
107107

108108
if(APPLE)
109-
add_weak_symbols("asan" WEAK_SYMBOL_LINKFLAGS)
110-
add_weak_symbols("ubsan" WEAK_SYMBOL_LINKFLAGS)
111-
add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINKFLAGS)
109+
add_weak_symbols("asan" WEAK_SYMBOL_LINK_FLAGS)
110+
add_weak_symbols("ubsan" WEAK_SYMBOL_LINK_FLAGS)
111+
add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINK_FLAGS)
112112

113113
add_compiler_rt_runtime(clang_rt.asan
114114
SHARED
@@ -121,7 +121,7 @@ if(APPLE)
121121
RTLSanCommon
122122
RTUbsan
123123
CFLAGS ${ASAN_DYNAMIC_CFLAGS}
124-
LINKFLAGS ${WEAK_SYMBOL_LINKFLAGS}
124+
LINK_FLAGS ${WEAK_SYMBOL_LINK_FLAGS}
125125
DEFS ${ASAN_DYNAMIC_DEFINITIONS}
126126
PARENT_TARGET asan)
127127
else()
@@ -188,7 +188,7 @@ else()
188188
RTAsan_dynamic_version_script_dummy
189189
RTUbsan_cxx
190190
CFLAGS ${ASAN_DYNAMIC_CFLAGS}
191-
LINKFLAGS ${ASAN_DYNAMIC_LINK_FLAGS}
191+
LINK_FLAGS ${ASAN_DYNAMIC_LINK_FLAGS}
192192
${VERSION_SCRIPT_FLAG}
193193
LINK_LIBS ${ASAN_DYNAMIC_LIBS}
194194
DEFS ${ASAN_DYNAMIC_DEFINITIONS}

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

+33-33
Original file line numberDiff line numberDiff line change
@@ -36,8 +36,8 @@ append_list_if(COMPILER_RT_HAS_WVARIADIC_MACROS_FLAG -Wno-variadic-macros ASAN_U
3636

3737
# This will ensure the target linker is used
3838
# during cross compilation
39-
set(ASAN_UNITTEST_COMMON_LINKFLAGS
40-
${COMPILER_RT_UNITTEST_LINKFLAGS})
39+
set(ASAN_UNITTEST_COMMON_LINK_FLAGS
40+
${COMPILER_RT_UNITTEST_LINK_FLAGS})
4141

4242
# -gline-tables-only must be enough for ASan, so use it if possible.
4343
if(COMPILER_RT_TEST_COMPILER_ID MATCHES "Clang")
@@ -48,7 +48,7 @@ endif()
4848
if(MSVC)
4949
list(APPEND ASAN_UNITTEST_COMMON_CFLAGS -gcodeview)
5050
endif()
51-
list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS -g)
51+
list(APPEND ASAN_UNITTEST_COMMON_LINK_FLAGS -g)
5252

5353
# Use -D instead of definitions to please custom compile command.
5454
list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
@@ -58,12 +58,12 @@ list(APPEND ASAN_UNITTEST_COMMON_CFLAGS
5858

5959
if(APPLE)
6060
list(APPEND ASAN_UNITTEST_COMMON_CFLAGS ${DARWIN_osx_CFLAGS})
61-
list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS ${DARWIN_osx_LINKFLAGS})
61+
list(APPEND ASAN_UNITTEST_COMMON_LINK_FLAGS ${DARWIN_osx_LINK_FLAGS})
6262

63-
add_weak_symbols("asan" WEAK_SYMBOL_LINKFLAGS)
64-
add_weak_symbols("ubsan" WEAK_SYMBOL_LINKFLAGS)
65-
add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINKFLAGS)
66-
list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS ${WEAK_SYMBOL_LINKFLAGS})
63+
add_weak_symbols("asan" WEAK_SYMBOL_LINK_FLAGS)
64+
add_weak_symbols("ubsan" WEAK_SYMBOL_LINK_FLAGS)
65+
add_weak_symbols("sanitizer_common" WEAK_SYMBOL_LINK_FLAGS)
66+
list(APPEND ASAN_UNITTEST_COMMON_LINK_FLAGS ${WEAK_SYMBOL_LINK_FLAGS})
6767
endif()
6868

6969
if(MSVC)
@@ -82,41 +82,41 @@ if(CAN_TARGET_x86_64 OR CAN_TARGET_i386)
8282
endif()
8383

8484
if(NOT MSVC)
85-
list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS --driver-mode=g++)
85+
list(APPEND ASAN_UNITTEST_COMMON_LINK_FLAGS --driver-mode=g++)
8686
endif()
8787

8888
# x86_64 FreeBSD 9.2 additionally requires libc++ to build the tests.
8989
if(CMAKE_SYSTEM MATCHES "FreeBSD-9.2-RELEASE")
90-
list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS "-lc++")
90+
list(APPEND ASAN_UNITTEST_COMMON_LINK_FLAGS "-lc++")
9191
endif()
9292

9393
# Unit tests on Mac depend on Foundation.
9494
if(APPLE)
95-
list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS -framework Foundation)
95+
list(APPEND ASAN_UNITTEST_COMMON_LINK_FLAGS -framework Foundation)
9696
endif()
9797
if(ANDROID)
98-
list(APPEND ASAN_UNITTEST_COMMON_LINKFLAGS -pie)
98+
list(APPEND ASAN_UNITTEST_COMMON_LINK_FLAGS -pie)
9999
endif()
100100

101-
set(ASAN_UNITTEST_INSTRUMENTED_LINKFLAGS
102-
${ASAN_UNITTEST_COMMON_LINKFLAGS})
103-
list(APPEND ASAN_UNITTEST_INSTRUMENTED_LINKFLAGS -fsanitize=address)
101+
set(ASAN_UNITTEST_INSTRUMENTED_LINK_FLAGS
102+
${ASAN_UNITTEST_COMMON_LINK_FLAGS})
103+
list(APPEND ASAN_UNITTEST_INSTRUMENTED_LINK_FLAGS -fsanitize=address)
104104

105-
set(ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINKFLAGS
106-
${ASAN_UNITTEST_INSTRUMENTED_LINKFLAGS}
105+
set(ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINK_FLAGS
106+
${ASAN_UNITTEST_INSTRUMENTED_LINK_FLAGS}
107107
-shared-libasan)
108108

109109
set(ASAN_UNITTEST_INSTRUMENTED_LIBS)
110110
# NDK r10 requires -latomic almost always.
111111
append_list_if(ANDROID atomic ASAN_UNITTEST_INSTRUMENTED_LIBS)
112112

113-
set(ASAN_UNITTEST_NOINST_LINKFLAGS ${ASAN_UNITTEST_COMMON_LINKFLAGS})
113+
set(ASAN_UNITTEST_NOINST_LINK_FLAGS ${ASAN_UNITTEST_COMMON_LINK_FLAGS})
114114
if(NOT APPLE)
115-
append_list_if(COMPILER_RT_HAS_LIBM -lm ASAN_UNITTEST_NOINST_LINKFLAGS)
116-
append_list_if(COMPILER_RT_HAS_LIBDL -ldl ASAN_UNITTEST_NOINST_LINKFLAGS)
117-
append_list_if(COMPILER_RT_HAS_LIBRT -lrt ASAN_UNITTEST_NOINST_LINKFLAGS)
118-
append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread ASAN_UNITTEST_NOINST_LINKFLAGS)
119-
append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINKFLAGS)
115+
append_list_if(COMPILER_RT_HAS_LIBM -lm ASAN_UNITTEST_NOINST_LINK_FLAGS)
116+
append_list_if(COMPILER_RT_HAS_LIBDL -ldl ASAN_UNITTEST_NOINST_LINK_FLAGS)
117+
append_list_if(COMPILER_RT_HAS_LIBRT -lrt ASAN_UNITTEST_NOINST_LINK_FLAGS)
118+
append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread ASAN_UNITTEST_NOINST_LINK_FLAGS)
119+
append_list_if(COMPILER_RT_HAS_LIBPTHREAD -pthread ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINK_FLAGS)
120120
endif()
121121

122122
# TODO(eugenis): move all -l flags above to _LIBS?
@@ -148,7 +148,7 @@ endmacro()
148148
# Link ASan unit test for a given architecture from a set
149149
# of objects in with given linker flags.
150150
macro(add_asan_test test_suite test_name arch kind)
151-
cmake_parse_arguments(TEST "WITH_TEST_RUNTIME" "" "OBJECTS;LINKFLAGS;SUBDIR" ${ARGN})
151+
cmake_parse_arguments(TEST "WITH_TEST_RUNTIME" "" "OBJECTS;LINK_FLAGS;SUBDIR" ${ARGN})
152152
get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
153153
set(TEST_DEPS ${TEST_OBJECTS})
154154
if(NOT COMPILER_RT_STANDALONE_BUILD)
@@ -172,7 +172,7 @@ macro(add_asan_test test_suite test_name arch kind)
172172
SUBDIR ${TEST_SUBDIR}
173173
OBJECTS ${TEST_OBJECTS}
174174
DEPS ${TEST_DEPS}
175-
LINK_FLAGS ${TEST_LINKFLAGS}
175+
LINK_FLAGS ${TEST_LINK_FLAGS}
176176
${TARGET_LINK_FLAGS})
177177
endmacro()
178178

@@ -237,8 +237,8 @@ macro(add_asan_tests_for_arch_and_kind arch kind)
237237
endforeach()
238238
# Clang links the static CRT by default. Override that to use the dynamic
239239
# CRT.
240-
set(ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINKFLAGS
241-
${ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINKFLAGS}
240+
set(ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINK_FLAGS
241+
${ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINK_FLAGS}
242242
-Wl,-nodefaultlib:libcmt,-defaultlib:msvcrt,-defaultlib:oldnames)
243243
else()
244244
set(ASAN_INST_DYNAMIC_TEST_OBJECTS ${ASAN_INST_TEST_OBJECTS})
@@ -256,7 +256,7 @@ macro(add_asan_tests_for_arch_and_kind arch kind)
256256
add_asan_test(AsanUnitTests "Asan-${arch}${kind}-Test"
257257
${arch} ${kind} SUBDIR "default"
258258
OBJECTS ${ASAN_INST_TEST_OBJECTS}
259-
LINKFLAGS ${ASAN_UNITTEST_INSTRUMENTED_LINKFLAGS})
259+
LINK_FLAGS ${ASAN_UNITTEST_INSTRUMENTED_LINK_FLAGS})
260260
if(COMPILER_RT_ASAN_HAS_STATIC_RUNTIME)
261261
# Create the 'dynamic' folder where ASAN tests are produced.
262262
if(CMAKE_CONFIGURATION_TYPES)
@@ -270,7 +270,7 @@ macro(add_asan_tests_for_arch_and_kind arch kind)
270270
add_asan_test(AsanDynamicUnitTests "Asan-${arch}${kind}-Dynamic-Test"
271271
${arch} ${kind} SUBDIR "dynamic"
272272
OBJECTS ${ASAN_INST_DYNAMIC_TEST_OBJECTS}
273-
LINKFLAGS ${ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINKFLAGS})
273+
LINK_FLAGS ${ASAN_DYNAMIC_UNITTEST_INSTRUMENTED_LINK_FLAGS})
274274
endif()
275275

276276
# Add static ASan runtime that will be linked with uninstrumented tests.
@@ -307,7 +307,7 @@ macro(add_asan_tests_for_arch_and_kind arch kind)
307307
add_asan_test(AsanUnitTests "Asan-${arch}${kind}-Noinst-Test"
308308
${arch} ${kind} SUBDIR "default"
309309
OBJECTS ${ASAN_NOINST_TEST_OBJECTS}
310-
LINKFLAGS ${ASAN_UNITTEST_NOINST_LINKFLAGS}
310+
LINK_FLAGS ${ASAN_UNITTEST_NOINST_LINK_FLAGS}
311311
WITH_TEST_RUNTIME)
312312

313313
# Benchmarks.
@@ -319,7 +319,7 @@ macro(add_asan_tests_for_arch_and_kind arch kind)
319319
add_asan_test(AsanBenchmarks "Asan-${arch}${kind}-Benchmark"
320320
${arch} ${kind} SUBDIR "default"
321321
OBJECTS ${ASAN_BENCHMARKS_OBJECTS}
322-
LINKFLAGS ${ASAN_UNITTEST_INSTRUMENTED_LINKFLAGS})
322+
LINK_FLAGS ${ASAN_UNITTEST_INSTRUMENTED_LINK_FLAGS})
323323
endmacro()
324324

325325
if(COMPILER_RT_CAN_EXECUTE_TESTS AND NOT ANDROID)
@@ -347,15 +347,15 @@ if(ANDROID)
347347
${COMPILER_RT_GTEST_SOURCE}
348348
${ASAN_NOINST_TEST_SOURCES})
349349
set_target_compile_flags(AsanNoinstTest ${ASAN_UNITTEST_COMMON_CFLAGS})
350-
set_target_link_flags(AsanNoinstTest ${ASAN_UNITTEST_NOINST_LINKFLAGS})
350+
set_target_link_flags(AsanNoinstTest ${ASAN_UNITTEST_NOINST_LINK_FLAGS})
351351
target_link_libraries(AsanNoinstTest ${ASAN_UNITTEST_NOINST_LIBS})
352352

353353
# Test with ASan instrumentation. Link with ASan dynamic runtime.
354354
add_executable(AsanTest
355355
${COMPILER_RT_GTEST_SOURCE}
356356
${ASAN_INST_TEST_SOURCES})
357357
set_target_compile_flags(AsanTest ${ASAN_UNITTEST_INSTRUMENTED_CFLAGS})
358-
set_target_link_flags(AsanTest ${ASAN_UNITTEST_INSTRUMENTED_LINKFLAGS})
358+
set_target_link_flags(AsanTest ${ASAN_UNITTEST_INSTRUMENTED_LINK_FLAGS})
359359
target_link_libraries(AsanTest ${ASAN_UNITTEST_INSTRUMENTED_LIBS})
360360

361361
# Setup correct output directory and link flags.

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

+3-3
Original file line numberDiff line numberDiff line change
@@ -69,15 +69,15 @@ macro(msan_compile obj_list source arch kind)
6969
endmacro()
7070

7171
macro(msan_link_shared so_list so_name arch kind)
72-
cmake_parse_arguments(SOURCE "" "" "OBJECTS;LINKFLAGS;DEPS" ${ARGN})
72+
cmake_parse_arguments(SOURCE "" "" "OBJECTS;LINK_FLAGS;DEPS" ${ARGN})
7373
set(output_so "${CMAKE_CURRENT_BINARY_DIR}/${so_name}.${arch}${kind}.so")
74-
get_target_flags_for_arch(${arch} TARGET_LINKFLAGS)
74+
get_target_flags_for_arch(${arch} TARGET_LINK_FLAGS)
7575
if(NOT COMPILER_RT_STANDALONE_BUILD)
7676
list(APPEND SOURCE_DEPS msan)
7777
endif()
7878
clang_link_shared(${output_so}
7979
OBJECTS ${SOURCE_OBJECTS}
80-
LINKFLAGS ${TARGET_LINKFLAGS} ${SOURCE_LINKFLAGS}
80+
LINK_FLAGS ${TARGET_LINK_FLAGS} ${SOURCE_LINK_FLAGS}
8181
DEPS ${SOURCE_DEPS})
8282
list(APPEND ${so_list} ${output_so})
8383
endmacro()

0 commit comments

Comments
 (0)