Skip to content

Commit f8f7109

Browse files
committed
[CMake] Use global SWIFT_HOST_TRIPLE consistently
Instead of calling 'get_swift_host_triple()' repeatedly, because it always return the same value.
1 parent f4e7c07 commit f8f7109

File tree

3 files changed

+7
-11
lines changed

3 files changed

+7
-11
lines changed

cmake/modules/AddPureSwift.cmake

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,8 +46,7 @@ function(_add_host_swift_compile_options name)
4646
$<$<COMPILE_LANGUAGE:Swift>:-runtime-compatibility-version>
4747
$<$<COMPILE_LANGUAGE:Swift>:none>)
4848

49-
swift_get_host_triple(target)
50-
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:Swift>:-target;${target}>)
49+
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:Swift>:-target;${SWIFT_HOST_TRIPLE}>)
5150
_add_host_variant_swift_sanitizer_flags(${name})
5251
endfunction()
5352

cmake/modules/AddSwift.cmake

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -131,22 +131,20 @@ endfunction()
131131
# Usage:
132132
# _add_host_variant_c_compile_link_flags(name)
133133
function(_add_host_variant_c_compile_link_flags name)
134-
swift_get_host_triple(target)
135-
136134
# MSVC and gcc don't understand -target.
137135
# clang-cl understands --target.
138136
if(CMAKE_C_COMPILER_ID MATCHES "Clang")
139137
if("${CMAKE_C_COMPILER_FRONTEND_VARIANT}" STREQUAL "MSVC") # clang-cl options
140-
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:--target=${target}>)
141-
target_link_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:--target=${target}>)
138+
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:--target=${SWIFT_HOST_TRIPLE}>)
139+
target_link_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:--target=${SWIFT_HOST_TRIPLE}>)
142140
else()
143-
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-target;${target}>)
144-
target_link_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-target;${target}>)
141+
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-target;${SWIFT_HOST_TRIPLE}>)
142+
target_link_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-target;${SWIFT_HOST_TRIPLE}>)
145143
endif()
146144
endif()
147145

148146
if (CMAKE_Swift_COMPILER)
149-
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:Swift>:-target;${target}>)
147+
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:Swift>:-target;${SWIFT_HOST_TRIPLE}>)
150148

151149
_add_host_variant_swift_sanitizer_flags(${name})
152150
endif()

test/CMakeLists.txt

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -210,8 +210,7 @@ normalize_boolean_spelling(SWIFT_STDLIB_ENABLE_OBJC_INTEROP)
210210
normalize_boolean_spelling(SWIFT_ENABLE_BACKTRACING)
211211
is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" SWIFT_OPTIMIZED)
212212

213-
# Get 'SWIFT_HOST_TRIPLE' and 'SWIFT_HOST_SDKROOT' for lit.site.cfg.in
214-
swift_get_host_triple(SWIFT_HOST_TRIPLE)
213+
# Get 'SWIFT_HOST_SDKROOT' for lit.site.cfg.in
215214
set(SWIFT_HOST_SDKROOT "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")
216215

217216
set(profdata_merge_worker

0 commit comments

Comments
 (0)