Skip to content

Commit 112681f

Browse files
stephankstephank
committed
build: fix accidental cmake expansions
As of CMake 3.25, there are now global variables `LINUX=1`, `ANDROID=1`, etc. These conflict with expressions that used these names as unquoted strings in positions where CMake accepts 'variable|string', for example: - `if(sdk STREQUAL LINUX)` would fail, because `LINUX` is now defined and expands to 1, where it would previously coerce to a string. - `if(${sdk} STREQUAL "LINUX")` would fail if `sdk=LINUX`, because the left-hand side expands twice. In this patch, I looked for a number of patterns to fix up, sometimes a little defensively: - Quoted right-hand side of `STREQUAL` where I was confident it was intended to be a string literal. - Removed manual variable expansion on left-hand side of `STREQUAL`, `MATCHES` and `IN_LIST` where I was confident it was unintended. Fixes swiftlang#65028.
1 parent f9611bc commit 112681f

File tree

37 files changed

+186
-186
lines changed

37 files changed

+186
-186
lines changed

‎CMakeLists.txt

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ else()
119119
if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|amd64")
120120
set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")
121121
elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64")
122-
if(SWIFT_HOST_VARIANT_SDK_default STREQUAL OSX)
122+
if(SWIFT_HOST_VARIANT_SDK_default STREQUAL "OSX")
123123
set(SWIFT_HOST_VARIANT_ARCH_default "arm64")
124124
else()
125125
set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")
@@ -336,7 +336,7 @@ set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING
336336
# - MultiThreadedDebug (/MTd)
337337
# - MultiThreadedDLL (/MD)
338338
# - MultiThreadedDebugDLL (/MDd)
339-
if(CMAKE_BUILD_TYPE STREQUAL Debug)
339+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
340340
set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDebugDLL)
341341
else()
342342
set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDLL)
@@ -598,7 +598,7 @@ if(SWIFT_BUILT_STANDALONE)
598598
project(Swift C CXX ASM)
599599
endif()
600600

601-
if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL MSVC)
601+
if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL "MSVC")
602602
include(ClangClCompileRules)
603603
elseif(UNIX)
604604
include(UnixCompileRules)
@@ -627,7 +627,7 @@ if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY AND "${SWIFT_CONCURRENCY_GLOBAL_EXECUTO
627627
endif()
628628

629629
set(SWIFT_BUILD_HOST_DISPATCH FALSE)
630-
if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)
630+
if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")
631631
# Only build libdispatch for the host if the host tools are being built and
632632
# specifically if these two libraries that depend on it are built.
633633
if(SWIFT_INCLUDE_TOOLS AND SWIFT_BUILD_SOURCEKIT)
@@ -801,11 +801,11 @@ endif()
801801
# build environment.
802802
if(LLVM_USE_LINKER)
803803
set(SWIFT_USE_LINKER_default "${LLVM_USE_LINKER}")
804-
elseif(${SWIFT_HOST_VARIANT_SDK} STREQUAL ANDROID)
804+
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")
805805
set(SWIFT_USE_LINKER_default "lld")
806-
elseif(CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)
806+
elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")
807807
set(SWIFT_USE_LINKER_default "lld")
808-
elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)
808+
elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")
809809
set(SWIFT_USE_LINKER_default "")
810810
else()
811811
set(SWIFT_USE_LINKER_default "gold")

‎SwiftCompilerSources/CMakeLists.txt

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -80,7 +80,7 @@ function(add_swift_compiler_modules_library name)
8080
list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import")
8181
endif()
8282

83-
if(CMAKE_BUILD_TYPE STREQUAL Debug)
83+
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
8484
list(APPEND swift_compile_options "-g")
8585
else()
8686
list(APPEND swift_compile_options "-O" "-cross-module-optimization")
@@ -98,7 +98,7 @@ function(add_swift_compiler_modules_library name)
9898
set(deployment_version "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")
9999
set(sdk_path "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")
100100
set(sdk_option "-sdk" "${sdk_path}")
101-
if(${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS")
101+
if(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS")
102102
# Let the cross-compiled compile don't pick up the compiled stdlib by providing
103103
# an (almost) empty resource dir.
104104
# The compiler will instead pick up the stdlib from the SDK.
@@ -117,7 +117,7 @@ function(add_swift_compiler_modules_library name)
117117
message(ERROR "libc++ not found in the toolchain.")
118118
endif()
119119
endif()
120-
elseif(${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE")
120+
elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")
121121
set(sdk_option "-sdk" "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")
122122
get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)
123123
set(sdk_option ${sdk_option} "-resource-dir" "${swift_exec_bin_dir}/../lib/swift")
@@ -253,13 +253,13 @@ else()
253253
add_dependencies(importedHeaderDependencies swift-ast-generated-headers)
254254
target_include_directories(importedHeaderDependencies PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../include/swift")
255255

256-
if(${BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE")
256+
if(BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")
257257

258258
if (NOT SWIFT_EXEC_FOR_SWIFT_MODULES)
259259
message(FATAL_ERROR "Need a swift toolchain building swift compiler sources")
260260
endif()
261261

262-
if(${BOOTSTRAPPING_MODE} STREQUAL "HOSTTOOLS")
262+
if(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")
263263
if(NOT SWIFT_EXEC_FOR_SWIFT_MODULES STREQUAL CMAKE_Swift_COMPILER)
264264
message(FATAL_ERROR "The Swift compiler (${CMAKE_Swift_COMPILER}) differs from the Swift compiler in SWIFT_NATIVE_SWIFT_TOOLS_PATH (${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc).")
265265
endif()
@@ -275,11 +275,11 @@ else()
275275
add_swift_compiler_modules_library(swiftCompilerModules
276276
SWIFT_EXEC "${SWIFT_EXEC_FOR_SWIFT_MODULES}")
277277

278-
elseif(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")
278+
elseif(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
279279

280280
set(b0_deps swift-frontend-bootstrapping0 symlink-headers-bootstrapping0)
281281
set(b1_deps swift-frontend-bootstrapping1 symlink-headers-bootstrapping1)
282-
if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING")
282+
if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")
283283
list(APPEND b0_deps swiftCore-bootstrapping0)
284284
list(APPEND b1_deps swiftCore-bootstrapping1)
285285
if(CMAKE_BUILD_TYPE STREQUAL "Debug")
@@ -290,7 +290,7 @@ else()
290290
list(APPEND b0_deps swiftDarwin-bootstrapping0)
291291
list(APPEND b1_deps swiftDarwin-bootstrapping1)
292292
endif()
293-
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)
293+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)
294294
list(APPEND b0_deps copy-libstdcxx-modulemap-bootstrapping0 copy-libstdcxx-header-bootstrapping0)
295295
list(APPEND b1_deps copy-libstdcxx-modulemap-bootstrapping1 copy-libstdcxx-header-bootstrapping1)
296296
endif()

‎benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ macro(configure_build)
2121
# thus allowing the --host-cc build-script argument to work here.
2222
get_filename_component(c_compiler ${CMAKE_C_COMPILER} NAME)
2323

24-
if(${c_compiler} STREQUAL "clang")
24+
if(c_compiler STREQUAL "clang")
2525
set(CLANG_EXEC ${CMAKE_C_COMPILER})
2626
else()
2727
if(NOT SWIFT_DARWIN_XCRUN_TOOLCHAIN)
@@ -713,7 +713,7 @@ function(swift_benchmark_compile)
713713

714714
if(NOT SWIFT_BENCHMARK_BUILT_STANDALONE)
715715
set(stdlib_dependencies "swift-frontend" "swiftCore-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
716-
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
716+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
717717
list(APPEND stdlib_dependencies "swiftDarwin-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")
718718
endif()
719719
foreach(stdlib_dependency ${UNIVERSAL_LIBRARY_NAMES_${SWIFT_BENCHMARK_COMPILE_PLATFORM}})

‎cmake/modules/AddSwift.cmake

Lines changed: 39 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,16 @@ function(_set_target_prefix_and_suffix target kind sdk)
6363
precondition(kind MESSAGE "kind is required")
6464
precondition(sdk MESSAGE "sdk is required")
6565

66-
if(${sdk} STREQUAL ANDROID)
67-
if(${kind} STREQUAL STATIC)
66+
if(sdk STREQUAL "ANDROID")
67+
if(kind STREQUAL "STATIC")
6868
set_target_properties(${target} PROPERTIES PREFIX "lib" SUFFIX ".a")
69-
elseif(${kind} STREQUAL SHARED)
69+
elseif(kind STREQUAL "SHARED")
7070
set_target_properties(${target} PROPERTIES PREFIX "lib" SUFFIX ".so")
7171
endif()
72-
elseif(${sdk} STREQUAL WINDOWS)
73-
if(${kind} STREQUAL STATIC)
72+
elseif(sdk STREQUAL "WINDOWS")
73+
if(kind STREQUAL "STATIC")
7474
set_target_properties(${target} PROPERTIES PREFIX "" SUFFIX ".lib")
75-
elseif(${kind} STREQUAL SHARED)
75+
elseif(kind STREQUAL "SHARED")
7676
set_target_properties(${target} PROPERTIES PREFIX "" SUFFIX ".dll")
7777
endif()
7878
endif()
@@ -115,7 +115,7 @@ function(_add_host_variant_c_compile_link_flags name)
115115
set(DEPLOYMENT_VERSION "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")
116116
endif()
117117

118-
if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)
118+
if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")
119119
set(DEPLOYMENT_VERSION ${SWIFT_ANDROID_API_LEVEL})
120120
endif()
121121

@@ -151,7 +151,7 @@ function(_add_host_variant_c_compile_link_flags name)
151151
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:--sysroot=${_sysroot}>)
152152
endif()
153153

154-
if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)
154+
if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")
155155
# Make sure the Android NDK lld is used.
156156
swift_android_tools_path(${SWIFT_HOST_VARIANT_ARCH} tools_path)
157157
target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-B${tools_path}>)
@@ -223,7 +223,7 @@ function(_add_host_variant_c_compile_flags target)
223223
endif()
224224
endif()
225225

226-
if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
226+
if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")
227227
# MSVC/clang-cl don't support -fno-pic or -fms-compatibility-version.
228228
if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)
229229
target_compile_options(${target} PRIVATE
@@ -276,14 +276,14 @@ function(_add_host_variant_c_compile_flags target)
276276
# NOTE(compnerd) workaround LLVM invoking `add_definitions(-D_DEBUG)` which
277277
# causes failures for the runtime library when cross-compiling due to
278278
# undefined symbols from the standard library.
279-
if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)
279+
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")
280280
target_compile_options(${target} PRIVATE
281281
$<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-U_DEBUG>)
282282
endif()
283283
endif()
284284
285-
if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)
286-
if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64)
285+
if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")
286+
if(SWIFT_HOST_VARIANT_ARCH STREQUAL "x86_64")
287287
# NOTE(compnerd) Android NDK 21 or lower will generate library calls to
288288
# `__sync_val_compare_and_swap_16` rather than lowering to the CPU's
289289
# `cmpxchg16b` instruction as the `cx16` feature is disabled due to a bug
@@ -317,15 +317,15 @@ function(_add_host_variant_c_compile_flags target)
317317
$<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-fprofile-instr-generate -fcoverage-mapping>)
318318
endif()
319319
320-
if((SWIFT_HOST_VARIANT_ARCH STREQUAL armv7 OR
321-
SWIFT_HOST_VARIANT_ARCH STREQUAL aarch64) AND
322-
(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX OR
323-
SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID))
320+
if((SWIFT_HOST_VARIANT_ARCH STREQUAL "armv7" OR
321+
SWIFT_HOST_VARIANT_ARCH STREQUAL "aarch64") AND
322+
(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" OR
323+
SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID"))
324324
target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-funwind-tables>)
325325
endif()
326326
327327
if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
328-
if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64)
328+
if(SWIFT_HOST_VARIANT_ARCH STREQUAL "x86_64")
329329
# this is the minimum architecture that supports 16 byte CAS, which is
330330
# necessary to avoid a dependency to libatomic
331331
target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-march=core2>)
@@ -336,7 +336,7 @@ function(_add_host_variant_c_compile_flags target)
336336
# llvm/llvm-project@66395c9, which can cause incompatibilities with the Swift
337337
# frontend if not built the same way.
338338
if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv6|armv7|i686" AND
339-
NOT (SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID AND SWIFT_ANDROID_API_LEVEL LESS 24))
339+
NOT (SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID" AND SWIFT_ANDROID_API_LEVEL LESS 24))
340340
target_compile_definitions(${target} PRIVATE
341341
$<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:_LARGEFILE_SOURCE _FILE_OFFSET_BITS=64>)
342342
endif()
@@ -345,19 +345,19 @@ endfunction()
345345
function(_add_host_variant_link_flags target)
346346
_add_host_variant_c_compile_link_flags(${target})
347347
348-
if(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)
348+
if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
349349
target_link_libraries(${target} PRIVATE
350350
pthread
351351
dl)
352352
if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv5|armv6|armv7|i686")
353353
target_link_libraries(${target} PRIVATE atomic)
354354
endif()
355-
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL FREEBSD)
355+
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "FREEBSD")
356356
target_link_libraries(${target} PRIVATE
357357
pthread)
358-
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN)
358+
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "CYGWIN")
359359
# No extra libraries required.
360-
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
360+
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")
361361
# We don't need to add -nostdlib using MSVC or clang-cl, as MSVC and
362362
# clang-cl rely on auto-linking entirely.
363363
if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)
@@ -375,12 +375,12 @@ function(_add_host_variant_link_flags target)
375375
# the Windows SDK on case sensitive file systems.
376376
target_link_directories(${target} PRIVATE
377377
${CMAKE_BINARY_DIR}/winsdk_lib_${SWIFT_HOST_VARIANT_ARCH}_symlinks)
378-
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL HAIKU)
378+
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "HAIKU")
379379
target_link_libraries(${target} PRIVATE
380380
bsd)
381381
target_link_options(${target} PRIVATE
382382
"SHELL:-Xlinker -Bsymbolic")
383-
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)
383+
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")
384384
target_link_libraries(${target} PRIVATE
385385
dl
386386
log
@@ -422,7 +422,7 @@ function(_add_host_variant_link_flags target)
422422
#
423423
# TODO: Evaluate/enable -f{function,data}-sections --gc-sections for bfd,
424424
# gold, and lld.
425-
if(NOT CMAKE_BUILD_TYPE STREQUAL Debug AND CMAKE_SYSTEM_NAME MATCHES Darwin)
425+
if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_SYSTEM_NAME MATCHES Darwin)
426426
if (NOT SWIFT_DISABLE_DEAD_STRIPPING)
427427
# See rdar://48283130: This gives 6MB+ size reductions for swift and
428428
# SourceKitService, and much larger size reductions for sil-opt etc.
@@ -446,7 +446,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
446446
# RPATH where Swift runtime can be found.
447447
set(swift_runtime_rpath)
448448
449-
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
449+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
450450
451451
set(sdk_dir "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift")
452452
@@ -529,7 +529,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
529529
530530
elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")
531531
set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")
532-
if(${ASRLF_BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE")
532+
if(ASRLF_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")
533533
# At build time and run time, link against the swift libraries in the
534534
# installed host toolchain.
535535
get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)
@@ -575,7 +575,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)
575575
# able to fall back to the SDK directory for libswiftCore et al.
576576
if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")
577577
if (NOT "${bootstrapping}" STREQUAL "1")
578-
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
578+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
579579
target_link_directories(${target} PRIVATE "${sdk_dir}")
580580
581581
# Include the abi stable system stdlib in our rpath.
@@ -706,10 +706,10 @@ function(add_swift_host_library name)
706706
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
707707
set_target_properties(${name} PROPERTIES
708708
INSTALL_NAME_DIR "@rpath")
709-
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)
709+
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")
710710
set_target_properties(${name} PROPERTIES
711711
INSTALL_RPATH "$ORIGIN")
712-
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN)
712+
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "CYGWIN")
713713
set_target_properties(${name} PROPERTIES
714714
INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin")
715715
elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")
@@ -731,18 +731,18 @@ function(add_swift_host_library name)
731731
endif()
732732
733733
# Set compilation and link flags.
734-
if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
734+
if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")
735735
swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}
736736
${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)
737737
target_include_directories(${name} SYSTEM PRIVATE
738738
${${SWIFT_HOST_VARIANT_ARCH}_INCLUDE})
739739
740-
if(libkind STREQUAL SHARED)
740+
if(libkind STREQUAL "SHARED")
741741
target_compile_definitions(${name} PRIVATE
742742
_WINDLL)
743743
endif()
744744
745-
if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)
745+
if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")
746746
swift_windows_get_sdk_vfs_overlay(ASHL_VFS_OVERLAY)
747747
# Both clang and clang-cl on Windows set CMAKE_C_SIMULATE_ID to MSVC.
748748
# We are using CMAKE_C_COMPILER_FRONTEND_VARIANT to detect the correct
@@ -770,7 +770,7 @@ function(add_swift_host_library name)
770770
771771
set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX)
772772
773-
if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)
773+
if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)
774774
target_link_options(${name} PRIVATE
775775
"LINKER:-compatibility_version,1")
776776
if(SWIFT_COMPILER_VERSION)
@@ -856,7 +856,7 @@ function(add_swift_host_tool executable)
856856
add_dependencies(${executable} ${LLVM_COMMON_DEPENDS})
857857
endif()
858858
859-
if(NOT ${ASHT_BOOTSTRAPPING} STREQUAL "")
859+
if(NOT "${ASHT_BOOTSTRAPPING}" STREQUAL "")
860860
# Strip the "-bootstrapping<n>" suffix from the target name to get the base
861861
# executable name.
862862
string(REGEX REPLACE "-bootstrapping.*" "" executable_filename ${executable})
@@ -891,7 +891,7 @@ function(add_swift_host_tool executable)
891891
BINARY_DIR ${out_bin_dir}
892892
LIBRARY_DIR ${out_lib_dir})
893893
894-
if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)
894+
if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")
895895
swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}
896896
${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)
897897
target_include_directories(${executable} SYSTEM PRIVATE
@@ -913,8 +913,8 @@ function(add_swift_host_tool executable)
913913
914914
if(SWIFT_SWIFT_PARSER)
915915
set(extra_relative_rpath "")
916-
if(NOT ${ASHT_BOOTSTRAPPING} STREQUAL "")
917-
if (${executable} MATCHES "-bootstrapping")
916+
if(NOT "${ASHT_BOOTSTRAPPING}" STREQUAL "")
917+
if(executable MATCHES "-bootstrapping")
918918
set(extra_relative_rpath "../")
919919
endif()
920920
endif()
@@ -938,7 +938,7 @@ function(add_swift_host_tool executable)
938938
target_link_options(${executable} PRIVATE "${lto_codegen_only_link_options}")
939939
endif()
940940

941-
if(NOT ${ASHT_SWIFT_COMPONENT} STREQUAL "no_component")
941+
if(NOT ASHT_SWIFT_COMPONENT STREQUAL "no_component")
942942
add_dependencies(${ASHT_SWIFT_COMPONENT} ${executable})
943943
swift_install_in_component(TARGETS ${executable}
944944
RUNTIME

0 commit comments

Comments
 (0)