commit f85d12198f4a4201d763cc481ccaf7025f0ec6ff · pyrox.dev/nixpkgs

+12 -8

pkgs/development/compilers/swift/compiler/default.nix

···

       99
       99
        
           # "clang-builtin-headers"

     

       100
       100
        
           "stdlib"

     

       101
       101
        
           "sdk-overlay"

     

       102
       102
       -
           "parser-lib"

     

       103
       102
        
           "static-mirror-lib"

     

       104
       103
        
           "editor-integration"

     

       105
       104
        
           # "tools"

     
···

       257
       256
        
           ${copySource "llvm-project"}

     

       258
       257
        
           ${copySource "swift"}

     

       259
       258
        
           ${copySource "swift-experimental-string-processing"}

     

       259
       259
       +
           ${copySource "swift-syntax"}

     

       260
       260
        
           ${lib.optionalString

     

       261
       261
        
             (!stdenv.isDarwin)

     

       262
       262
        
             (copySource "swift-corelibs-libdispatch")}

     
···

       276
       276
        
             -e 's|/bin/cp|${coreutils}/bin/cp|g' \

     

       277
       277
        
             -e 's|/usr/bin/file|${file}/bin/file|g'

     

       278
       278
        
       

     

       279
       279
       +
           patch -p1 -d swift -i ${./patches/swift-cmake-3.25-compat.patch}

     

       279
       280
        
           patch -p1 -d swift -i ${./patches/swift-wrap.patch}

     

       280
       281
        
           patch -p1 -d swift -i ${./patches/swift-nix-resource-root.patch}

     

       282
       282
       +
           patch -p1 -d swift -i ${./patches/swift-linux-fix-libc-paths.patch}

     

       281
       283
        
           patch -p1 -d swift -i ${./patches/swift-linux-fix-linking.patch}

     

       284
       284
       +
           patch -p1 -d swift -i ${./patches/swift-darwin-libcxx-flags.patch}

     

       285
       285
       +
           patch -p1 -d swift -i ${./patches/swift-darwin-link-cxxabi.patch}

     

       282
       286
        
           patch -p1 -d swift -i ${substituteAll {

     

       283
       287
        
             src = ./patches/swift-darwin-plistbuddy-workaround.patch;

     

       284
       288
        
             inherit swiftArch;

     
···

       287
       291
        
             src = ./patches/swift-prevent-sdk-dirs-warning.patch;

     

       288
       292
        
             inherit (builtins) storeDir;

     

       289
       293
        
           }}

     

       290
       290
       -
           substituteInPlace swift/cmake/modules/SwiftConfigureSDK.cmake \

     

       291
       291
       -
             --replace '/usr/include' "${stdenv.cc.libc_dev}/include"

     

       292
       294
        
       

     

       293
       295
        
           # This patch needs to know the lib output location, so must be substituted

     

       294
       296
        
           # in the same derivation as the compiler.

     
···

       321
       323
        
           ''}

     

       322
       324
        
       

     

       323
       325
        
           # Remove tests for cross compilation, which we don't currently support.

     

       324
       324
       -
           rm swift/test/Interop/Cxx/class/constructors-copy-irgen.swift

     

       325
       325
       -
           rm swift/test/Interop/Cxx/class/constructors-irgen.swift

     

       326
       326
       +
           rm swift/test/Interop/Cxx/class/constructors-copy-irgen-*.swift

     

       327
       327
       +
           rm swift/test/Interop/Cxx/class/constructors-irgen-*.swift

     

       326
       328
        
       

     

       327
       329
        
           # TODO: consider fixing and re-adding. This test fails due to a non-standard "install_prefix".

     

       328
       330
        
           rm swift/validation-test/Python/build_swift.swift

     
···

       342
       344
        
           rm swift/test/Serialization/restrict-swiftmodule-to-revision.swift

     

       343
       345
        
       

     

       344
       346
        
           # This test was flaky in ofborg, see #186476

     

       345
       345
       -
           rm swift/test/AutoDiff/compiler_crashers_fixed/sr14290-missing-debug-scopes-in-pullback-trampoline.swift

     

       347
       347
       +
           rm swift/test/AutoDiff/compiler_crashers_fixed/issue-56649-missing-debug-scopes-in-pullback-trampoline.swift

     

       346
       348
        
       

     

       347
       349
        
           patchShebangs .

     

       348
       350
        
       

     
···

       446
       448
        
             -DSWIFT_PATH_TO_CMARK_SOURCE=$SWIFT_SOURCE_ROOT/swift-cmark

     

       447
       449
        
             -DSWIFT_PATH_TO_CMARK_BUILD=$SWIFT_BUILD_ROOT/swift-cmark

     

       448
       450
        
             -DSWIFT_PATH_TO_LIBDISPATCH_SOURCE=$SWIFT_SOURCE_ROOT/swift-corelibs-libdispatch

     

       449
       449
       -
             -DEXPERIMENTAL_STRING_PROCESSING_SOURCE_DIR=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing

     

       451
       451
       +
             -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax

     

       452
       452
       +
             -DSWIFT_PATH_TO_STRING_PROCESSING_SOURCE=$SWIFT_SOURCE_ROOT/swift-experimental-string-processing

     

       450
       453
        
             -DSWIFT_INSTALL_COMPONENTS=${lib.concatStringsSep ";" swiftInstallComponents}

     

       451
       454
        
             -DSWIFT_STDLIB_ENABLE_OBJC_INTEROP=${if stdenv.isDarwin then "ON" else "OFF"}

     

       452
       455
        
           "

     
···

       501
       504
        
           cmakeFlags="

     

       502
       505
        
             -GNinja

     

       503
       506
        
             -DCMAKE_Swift_COMPILER=$SWIFT_BUILD_ROOT/swift/bin/swiftc

     

       507
       507
       +
             -DSWIFT_PATH_TO_SWIFT_SYNTAX_SOURCE=$SWIFT_SOURCE_ROOT/swift-syntax

     

       504
       508
        
       

     

       505
       509
        
             -DTOOLCHAIN_DIR=/var/empty

     

       506
       510
        
             -DSWIFT_NATIVE_LLVM_TOOLS_PATH=${stdenv.cc}/bin

     
···

       579
       583
        
           # Undo the clang and swift wrapping we did for the build.

     

       580
       584
        
           # (This happened via patches to cmake files.)

     

       581
       585
        
           cd $SWIFT_BUILD_ROOT

     

       582
       582
       -
           mv llvm/bin/clang-14{-unwrapped,}

     

       586
       586
       +
           mv llvm/bin/clang-15{-unwrapped,}

     

       583
       587
        
           mv swift/bin/swift-frontend{-unwrapped,}

     

       584
       588
        
       

     

       585
       589
        
           mkdir $out $lib

+1509

pkgs/development/compilers/swift/compiler/patches/swift-cmake-3.25-compat.patch

···

       1
       1
       +
       Upstream PR: https://github.com/apple/swift/pull/65534

     

       2
       2
       +
       

     

       3
       3
       +
       commit 112681f7f5927588569b225d926ca9f5f9ec98b3

     

       4
       4
       +
       Author: Stéphan Kochen <git@stephank.nl>

     

       5
       5
       +
       Date:   Sat Apr 29 20:34:40 2023 +0200

     

       6
       6
       +
       

     

       7
       7
       +
           build: fix accidental cmake expansions

     

       8
       8
       +
           

     

       9
       9
       +
           As of CMake 3.25, there are now global variables `LINUX=1`, `ANDROID=1`,

     

       10
       10
       +
           etc. These conflict with expressions that used these names as unquoted

     

       11
       11
       +
           strings in positions where CMake accepts 'variable|string', for example:

     

       12
       12
       +
           

     

       13
       13
       +
           - `if(sdk STREQUAL LINUX)` would fail, because `LINUX` is now defined and

     

       14
       14
       +
             expands to 1, where it would previously coerce to a string.

     

       15
       15
       +
           

     

       16
       16
       +
           - `if(${sdk} STREQUAL "LINUX")` would fail if `sdk=LINUX`, because the

     

       17
       17
       +
             left-hand side expands twice.

     

       18
       18
       +
           

     

       19
       19
       +
           In this patch, I looked for a number of patterns to fix up, sometimes a

     

       20
       20
       +
           little defensively:

     

       21
       21
       +
           

     

       22
       22
       +
           - Quoted right-hand side of `STREQUAL` where I was confident it was

     

       23
       23
       +
             intended to be a string literal.

     

       24
       24
       +
           

     

       25
       25
       +
           - Removed manual variable expansion on left-hand side of `STREQUAL`,

     

       26
       26
       +
             `MATCHES` and `IN_LIST` where I was confident it was unintended.

     

       27
       27
       +
           

     

       28
       28
       +
           Fixes #65028.

     

       29
       29
       +
       

     

       30
       30
       +
       diff --git a/CMakeLists.txt b/CMakeLists.txt

     

       31
       31
       +
       index eaab71fbaf0..45aa5d65dd3 100644

     

       32
       32
       +
       --- a/CMakeLists.txt

     

       33
       33
       +
       +++ b/CMakeLists.txt

     

       34
       34
       +
       @@ -119,7 +119,7 @@ else()

     

       35
       35
       +
          if(CMAKE_SYSTEM_PROCESSOR MATCHES "x86_64|AMD64|amd64")

     

       36
       36
       +
            set(SWIFT_HOST_VARIANT_ARCH_default "x86_64")

     

       37
       37
       +
          elseif(CMAKE_SYSTEM_PROCESSOR MATCHES "aarch64|ARM64|arm64")

     

       38
       38
       +
       -    if(SWIFT_HOST_VARIANT_SDK_default STREQUAL OSX)

     

       39
       39
       +
       +    if(SWIFT_HOST_VARIANT_SDK_default STREQUAL "OSX")

     

       40
       40
       +
              set(SWIFT_HOST_VARIANT_ARCH_default "arm64")

     

       41
       41
       +
            else()

     

       42
       42
       +
              set(SWIFT_HOST_VARIANT_ARCH_default "aarch64")

     

       43
       43
       +
       @@ -336,7 +336,7 @@ set(SWIFT_STDLIB_BUILD_TYPE "${CMAKE_BUILD_TYPE}" CACHE STRING

     

       44
       44
       +
        #   - MultiThreadedDebug (/MTd)

     

       45
       45
       +
        #   - MultiThreadedDLL (/MD)

     

       46
       46
       +
        #   - MultiThreadedDebugDLL (/MDd)

     

       47
       47
       +
       -if(CMAKE_BUILD_TYPE STREQUAL Debug)

     

       48
       48
       +
       +if(CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       49
       49
       +
          set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDebugDLL)

     

       50
       50
       +
        else()

     

       51
       51
       +
          set(SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY_default MultiThreadedDLL)

     

       52
       52
       +
       @@ -598,7 +598,7 @@ if(SWIFT_BUILT_STANDALONE)

     

       53
       53
       +
          project(Swift C CXX ASM)

     

       54
       54
       +
        endif()

     

       55
       55
       +
        

     

       56
       56
       +
       -if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL MSVC)

     

       57
       57
       +
       +if(MSVC OR "${CMAKE_SIMULATE_ID}" STREQUAL "MSVC")

     

       58
       58
       +
          include(ClangClCompileRules)

     

       59
       59
       +
        elseif(UNIX)

     

       60
       60
       +
          include(UnixCompileRules)

     

       61
       61
       +
       @@ -627,7 +627,7 @@ if(SWIFT_ENABLE_EXPERIMENTAL_CONCURRENCY AND "${SWIFT_CONCURRENCY_GLOBAL_EXECUTO

     

       62
       62
       +
        endif()

     

       63
       63
       +
        

     

       64
       64
       +
        set(SWIFT_BUILD_HOST_DISPATCH FALSE)

     

       65
       65
       +
       -if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       66
       66
       +
       +if(SWIFT_ENABLE_DISPATCH AND NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       67
       67
       +
          # Only build libdispatch for the host if the host tools are being built and

     

       68
       68
       +
          # specifically if these two libraries that depend on it are built.

     

       69
       69
       +
          if(SWIFT_INCLUDE_TOOLS AND SWIFT_BUILD_SOURCEKIT)

     

       70
       70
       +
       @@ -801,11 +801,11 @@ endif()

     

       71
       71
       +
        # build environment.

     

       72
       72
       +
        if(LLVM_USE_LINKER)

     

       73
       73
       +
          set(SWIFT_USE_LINKER_default "${LLVM_USE_LINKER}")

     

       74
       74
       +
       -elseif(${SWIFT_HOST_VARIANT_SDK} STREQUAL ANDROID)

     

       75
       75
       +
       +elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       76
       76
       +
          set(SWIFT_USE_LINKER_default "lld")

     

       77
       77
       +
       -elseif(CMAKE_SYSTEM_NAME STREQUAL Windows AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       78
       78
       +
       +elseif(CMAKE_SYSTEM_NAME STREQUAL "Windows" AND NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       79
       79
       +
          set(SWIFT_USE_LINKER_default "lld")

     

       80
       80
       +
       -elseif(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       81
       81
       +
       +elseif(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       82
       82
       +
          set(SWIFT_USE_LINKER_default "")

     

       83
       83
       +
        else()

     

       84
       84
       +
          set(SWIFT_USE_LINKER_default "gold")

     

       85
       85
       +
       diff --git a/SwiftCompilerSources/CMakeLists.txt b/SwiftCompilerSources/CMakeLists.txt

     

       86
       86
       +
       index 225e72663a1..d14e0ccecac 100644

     

       87
       87
       +
       --- a/SwiftCompilerSources/CMakeLists.txt

     

       88
       88
       +
       +++ b/SwiftCompilerSources/CMakeLists.txt

     

       89
       89
       +
       @@ -80,7 +80,7 @@ function(add_swift_compiler_modules_library name)

     

       90
       90
       +
            list(APPEND swift_compile_options "-Xfrontend" "-disable-implicit-string-processing-module-import")

     

       91
       91
       +
          endif()

     

       92
       92
       +
        

     

       93
       93
       +
       -  if(CMAKE_BUILD_TYPE STREQUAL Debug)

     

       94
       94
       +
       +  if(CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       95
       95
       +
            list(APPEND swift_compile_options "-g")

     

       96
       96
       +
          else()

     

       97
       97
       +
            list(APPEND swift_compile_options "-O" "-cross-module-optimization")

     

       98
       98
       +
       @@ -98,7 +98,7 @@ function(add_swift_compiler_modules_library name)

     

       99
       99
       +
            set(deployment_version "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")

     

       100
       100
       +
            set(sdk_path "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")

     

       101
       101
       +
            set(sdk_option "-sdk" "${sdk_path}")

     

       102
       102
       +
       -    if(${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS")

     

       103
       103
       +
       +    if(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE-WITH-HOSTLIBS")

     

       104
       104
       +
              # Let the cross-compiled compile don't pick up the compiled stdlib by providing

     

       105
       105
       +
              # an (almost) empty resource dir.

     

       106
       106
       +
              # The compiler will instead pick up the stdlib from the SDK.

     

       107
       107
       +
       @@ -117,7 +117,7 @@ function(add_swift_compiler_modules_library name)

     

       108
       108
       +
                message(ERROR "libc++ not found in the toolchain.")

     

       109
       109
       +
              endif()

     

       110
       110
       +
            endif()

     

       111
       111
       +
       -  elseif(${BOOTSTRAPPING_MODE} STREQUAL "CROSSCOMPILE")

     

       112
       112
       +
       +  elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")

     

       113
       113
       +
            set(sdk_option "-sdk" "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")

     

       114
       114
       +
            get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       115
       115
       +
            set(sdk_option ${sdk_option} "-resource-dir" "${swift_exec_bin_dir}/../lib/swift")

     

       116
       116
       +
       @@ -253,13 +253,13 @@ else()

     

       117
       117
       +
          add_dependencies(importedHeaderDependencies swift-ast-generated-headers)

     

       118
       118
       +
          target_include_directories(importedHeaderDependencies PRIVATE "${CMAKE_CURRENT_SOURCE_DIR}/../include/swift")

     

       119
       119
       +
        

     

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

     

       121
       121
       +
       +  if(BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       122
       122
       +
        

     

       123
       123
       +
            if (NOT SWIFT_EXEC_FOR_SWIFT_MODULES)

     

       124
       124
       +
              message(FATAL_ERROR "Need a swift toolchain building swift compiler sources")

     

       125
       125
       +
            endif()

     

       126
       126
       +
        

     

       127
       127
       +
       -    if(${BOOTSTRAPPING_MODE} STREQUAL "HOSTTOOLS")

     

       128
       128
       +
       +    if(BOOTSTRAPPING_MODE STREQUAL "HOSTTOOLS")

     

       129
       129
       +
              if(NOT SWIFT_EXEC_FOR_SWIFT_MODULES STREQUAL CMAKE_Swift_COMPILER)

     

       130
       130
       +
                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).")

     

       131
       131
       +
              endif()

     

       132
       132
       +
       @@ -275,11 +275,11 @@ else()

     

       133
       133
       +
            add_swift_compiler_modules_library(swiftCompilerModules

     

       134
       134
       +
              SWIFT_EXEC "${SWIFT_EXEC_FOR_SWIFT_MODULES}")

     

       135
       135
       +
        

     

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

     

       137
       137
       +
       +  elseif(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       138
       138
       +
        

     

       139
       139
       +
            set(b0_deps swift-frontend-bootstrapping0 symlink-headers-bootstrapping0)

     

       140
       140
       +
            set(b1_deps swift-frontend-bootstrapping1 symlink-headers-bootstrapping1)

     

       141
       141
       +
       -    if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING")

     

       142
       142
       +
       +    if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")

     

       143
       143
       +
              list(APPEND b0_deps swiftCore-bootstrapping0)

     

       144
       144
       +
              list(APPEND b1_deps swiftCore-bootstrapping1)

     

       145
       145
       +
              if(CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       146
       146
       +
       @@ -290,7 +290,7 @@ else()

     

       147
       147
       +
                list(APPEND b0_deps swiftDarwin-bootstrapping0)

     

       148
       148
       +
                list(APPEND b1_deps swiftDarwin-bootstrapping1)

     

       149
       149
       +
              endif()

     

       150
       150
       +
       -      if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)

     

       151
       151
       +
       +      if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)

     

       152
       152
       +
                list(APPEND b0_deps copy-libstdcxx-modulemap-bootstrapping0 copy-libstdcxx-header-bootstrapping0)

     

       153
       153
       +
                list(APPEND b1_deps copy-libstdcxx-modulemap-bootstrapping1 copy-libstdcxx-header-bootstrapping1)

     

       154
       154
       +
              endif()

     

       155
       155
       +
       diff --git a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

     

       156
       156
       +
       index dd989efe618..3ed37754214 100644

     

       157
       157
       +
       --- a/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

     

       158
       158
       +
       +++ b/benchmark/cmake/modules/AddSwiftBenchmarkSuite.cmake

     

       159
       159
       +
       @@ -21,7 +21,7 @@ macro(configure_build)

     

       160
       160
       +
            # thus allowing the --host-cc build-script argument to work here.

     

       161
       161
       +
            get_filename_component(c_compiler ${CMAKE_C_COMPILER} NAME)

     

       162
       162
       +
        

     

       163
       163
       +
       -    if(${c_compiler} STREQUAL "clang")

     

       164
       164
       +
       +    if(c_compiler STREQUAL "clang")

     

       165
       165
       +
              set(CLANG_EXEC ${CMAKE_C_COMPILER})

     

       166
       166
       +
            else()

     

       167
       167
       +
              if(NOT SWIFT_DARWIN_XCRUN_TOOLCHAIN)

     

       168
       168
       +
       @@ -713,7 +713,7 @@ function(swift_benchmark_compile)

     

       169
       169
       +
        

     

       170
       170
       +
          if(NOT SWIFT_BENCHMARK_BUILT_STANDALONE)

     

       171
       171
       +
            set(stdlib_dependencies "swift-frontend" "swiftCore-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")

     

       172
       172
       +
       -    if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       173
       173
       +
       +    if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       174
       174
       +
              list(APPEND stdlib_dependencies "swiftDarwin-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}")

     

       175
       175
       +
            endif()

     

       176
       176
       +
            foreach(stdlib_dependency ${UNIVERSAL_LIBRARY_NAMES_${SWIFT_BENCHMARK_COMPILE_PLATFORM}})

     

       177
       177
       +
       diff --git a/cmake/modules/AddSwift.cmake b/cmake/modules/AddSwift.cmake

     

       178
       178
       +
       index 58c7eb1bd4f..96c4fe804f9 100644

     

       179
       179
       +
       --- a/cmake/modules/AddSwift.cmake

     

       180
       180
       +
       +++ b/cmake/modules/AddSwift.cmake

     

       181
       181
       +
       @@ -63,16 +63,16 @@ function(_set_target_prefix_and_suffix target kind sdk)

     

       182
       182
       +
          precondition(kind MESSAGE "kind is required")

     

       183
       183
       +
          precondition(sdk MESSAGE "sdk is required")

     

       184
       184
       +
        

     

       185
       185
       +
       -  if(${sdk} STREQUAL ANDROID)

     

       186
       186
       +
       -    if(${kind} STREQUAL STATIC)

     

       187
       187
       +
       +  if(sdk STREQUAL "ANDROID")

     

       188
       188
       +
       +    if(kind STREQUAL "STATIC")

     

       189
       189
       +
              set_target_properties(${target} PROPERTIES PREFIX "lib" SUFFIX ".a")

     

       190
       190
       +
       -    elseif(${kind} STREQUAL SHARED)

     

       191
       191
       +
       +    elseif(kind STREQUAL "SHARED")

     

       192
       192
       +
              set_target_properties(${target} PROPERTIES PREFIX "lib" SUFFIX ".so")

     

       193
       193
       +
            endif()

     

       194
       194
       +
       -  elseif(${sdk} STREQUAL WINDOWS)

     

       195
       195
       +
       -    if(${kind} STREQUAL STATIC)

     

       196
       196
       +
       +  elseif(sdk STREQUAL "WINDOWS")

     

       197
       197
       +
       +    if(kind STREQUAL "STATIC")

     

       198
       198
       +
              set_target_properties(${target} PROPERTIES PREFIX "" SUFFIX ".lib")

     

       199
       199
       +
       -    elseif(${kind} STREQUAL SHARED)

     

       200
       200
       +
       +    elseif(kind STREQUAL "SHARED")

     

       201
       201
       +
              set_target_properties(${target} PROPERTIES PREFIX "" SUFFIX ".dll")

     

       202
       202
       +
            endif()

     

       203
       203
       +
          endif()

     

       204
       204
       +
       @@ -115,7 +115,7 @@ function(_add_host_variant_c_compile_link_flags name)

     

       205
       205
       +
            set(DEPLOYMENT_VERSION "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_DEPLOYMENT_VERSION}")

     

       206
       206
       +
          endif()

     

       207
       207
       +
        

     

       208
       208
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)

     

       209
       209
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       210
       210
       +
            set(DEPLOYMENT_VERSION ${SWIFT_ANDROID_API_LEVEL})

     

       211
       211
       +
          endif()

     

       212
       212
       +
        

     

       213
       213
       +
       @@ -151,7 +151,7 @@ function(_add_host_variant_c_compile_link_flags name)

     

       214
       214
       +
            target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:--sysroot=${_sysroot}>)

     

       215
       215
       +
          endif()

     

       216
       216
       +
        

     

       217
       217
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)

     

       218
       218
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       219
       219
       +
            # Make sure the Android NDK lld is used.

     

       220
       220
       +
            swift_android_tools_path(${SWIFT_HOST_VARIANT_ARCH} tools_path)

     

       221
       221
       +
            target_compile_options(${name} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-B${tools_path}>)

     

       222
       222
       +
       @@ -223,7 +223,7 @@ function(_add_host_variant_c_compile_flags target)

     

       223
       223
       +
            endif()

     

       224
       224
       +
          endif()

     

       225
       225
       +
        

     

       226
       226
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       227
       227
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       228
       228
       +
            # MSVC/clang-cl don't support -fno-pic or -fms-compatibility-version.

     

       229
       229
       +
            if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)

     

       230
       230
       +
              target_compile_options(${target} PRIVATE

     

       231
       231
       +
       @@ -276,14 +276,14 @@ function(_add_host_variant_c_compile_flags target)

     

       232
       232
       +
            # NOTE(compnerd) workaround LLVM invoking `add_definitions(-D_DEBUG)` which

     

       233
       233
       +
            # causes failures for the runtime library when cross-compiling due to

     

       234
       234
       +
            # undefined symbols from the standard library.

     

       235
       235
       +
       -    if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)

     

       236
       236
       +
       +    if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       237
       237
       +
              target_compile_options(${target} PRIVATE

     

       238
       238
       +
                $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-U_DEBUG>)

     

       239
       239
       +
            endif()

     

       240
       240
       +
          endif()

     

       241
       241
       +
        

     

       242
       242
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)

     

       243
       243
       +
       -    if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64)

     

       244
       244
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       245
       245
       +
       +    if(SWIFT_HOST_VARIANT_ARCH STREQUAL "x86_64")

     

       246
       246
       +
              # NOTE(compnerd) Android NDK 21 or lower will generate library calls to

     

       247
       247
       +
              # `__sync_val_compare_and_swap_16` rather than lowering to the CPU's

     

       248
       248
       +
              # `cmpxchg16b` instruction as the `cx16` feature is disabled due to a bug

     

       249
       249
       +
       @@ -317,15 +317,15 @@ function(_add_host_variant_c_compile_flags target)

     

       250
       250
       +
              $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-fprofile-instr-generate -fcoverage-mapping>)

     

       251
       251
       +
          endif()

     

       252
       252
       +
        

     

       253
       253
       +
       -  if((SWIFT_HOST_VARIANT_ARCH STREQUAL armv7 OR

     

       254
       254
       +
       -      SWIFT_HOST_VARIANT_ARCH STREQUAL aarch64) AND

     

       255
       255
       +
       -     (SWIFT_HOST_VARIANT_SDK STREQUAL LINUX OR

     

       256
       256
       +
       -      SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID))

     

       257
       257
       +
       +  if((SWIFT_HOST_VARIANT_ARCH STREQUAL "armv7" OR

     

       258
       258
       +
       +      SWIFT_HOST_VARIANT_ARCH STREQUAL "aarch64") AND

     

       259
       259
       +
       +     (SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX" OR

     

       260
       260
       +
       +      SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID"))

     

       261
       261
       +
            target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-funwind-tables>)

     

       262
       262
       +
          endif()

     

       263
       263
       +
        

     

       264
       264
       +
          if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")

     

       265
       265
       +
       -    if(SWIFT_HOST_VARIANT_ARCH STREQUAL x86_64)

     

       266
       266
       +
       +    if(SWIFT_HOST_VARIANT_ARCH STREQUAL "x86_64")

     

       267
       267
       +
              # this is the minimum architecture that supports 16 byte CAS, which is

     

       268
       268
       +
              # necessary to avoid a dependency to libatomic

     

       269
       269
       +
              target_compile_options(${target} PRIVATE $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:-march=core2>)

     

       270
       270
       +
       @@ -336,7 +336,7 @@ function(_add_host_variant_c_compile_flags target)

     

       271
       271
       +
          # llvm/llvm-project@66395c9, which can cause incompatibilities with the Swift

     

       272
       272
       +
          # frontend if not built the same way.

     

       273
       273
       +
          if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv6|armv7|i686" AND

     

       274
       274
       +
       -     NOT (SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID AND SWIFT_ANDROID_API_LEVEL LESS 24))

     

       275
       275
       +
       +     NOT (SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID" AND SWIFT_ANDROID_API_LEVEL LESS 24))

     

       276
       276
       +
            target_compile_definitions(${target} PRIVATE

     

       277
       277
       +
              $<$<COMPILE_LANGUAGE:C,CXX,OBJC,OBJCXX>:_LARGEFILE_SOURCE _FILE_OFFSET_BITS=64>)

     

       278
       278
       +
          endif()

     

       279
       279
       +
       @@ -345,19 +345,19 @@ endfunction()

     

       280
       280
       +
        function(_add_host_variant_link_flags target)

     

       281
       281
       +
          _add_host_variant_c_compile_link_flags(${target})

     

       282
       282
       +
        

     

       283
       283
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)

     

       284
       284
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")

     

       285
       285
       +
            target_link_libraries(${target} PRIVATE

     

       286
       286
       +
              pthread

     

       287
       287
       +
              dl)

     

       288
       288
       +
            if("${SWIFT_HOST_VARIANT_ARCH}" MATCHES "armv5|armv6|armv7|i686")

     

       289
       289
       +
              target_link_libraries(${target} PRIVATE atomic)

     

       290
       290
       +
            endif()

     

       291
       291
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL FREEBSD)

     

       292
       292
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "FREEBSD")

     

       293
       293
       +
            target_link_libraries(${target} PRIVATE

     

       294
       294
       +
              pthread)

     

       295
       295
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN)

     

       296
       296
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "CYGWIN")

     

       297
       297
       +
            # No extra libraries required.

     

       298
       298
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       299
       299
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       300
       300
       +
            # We don't need to add -nostdlib using MSVC or clang-cl, as MSVC and

     

       301
       301
       +
            # clang-cl rely on auto-linking entirely.

     

       302
       302
       +
            if(NOT SWIFT_COMPILER_IS_MSVC_LIKE)

     

       303
       303
       +
       @@ -375,12 +375,12 @@ function(_add_host_variant_link_flags target)

     

       304
       304
       +
            # the Windows SDK on case sensitive file systems.

     

       305
       305
       +
            target_link_directories(${target} PRIVATE

     

       306
       306
       +
              ${CMAKE_BINARY_DIR}/winsdk_lib_${SWIFT_HOST_VARIANT_ARCH}_symlinks)

     

       307
       307
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL HAIKU)

     

       308
       308
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "HAIKU")

     

       309
       309
       +
            target_link_libraries(${target} PRIVATE

     

       310
       310
       +
              bsd)

     

       311
       311
       +
            target_link_options(${target} PRIVATE

     

       312
       312
       +
              "SHELL:-Xlinker -Bsymbolic")

     

       313
       313
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL ANDROID)

     

       314
       314
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       315
       315
       +
            target_link_libraries(${target} PRIVATE

     

       316
       316
       +
              dl

     

       317
       317
       +
              log

     

       318
       318
       +
       @@ -422,7 +422,7 @@ function(_add_host_variant_link_flags target)

     

       319
       319
       +
          #

     

       320
       320
       +
          # TODO: Evaluate/enable -f{function,data}-sections --gc-sections for bfd,

     

       321
       321
       +
          # gold, and lld.

     

       322
       322
       +
       -  if(NOT CMAKE_BUILD_TYPE STREQUAL Debug AND CMAKE_SYSTEM_NAME MATCHES Darwin)

     

       323
       323
       +
       +  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug" AND CMAKE_SYSTEM_NAME MATCHES Darwin)

     

       324
       324
       +
            if (NOT SWIFT_DISABLE_DEAD_STRIPPING)

     

       325
       325
       +
              # See rdar://48283130: This gives 6MB+ size reductions for swift and

     

       326
       326
       +
              # SourceKitService, and much larger size reductions for sil-opt etc.

     

       327
       327
       +
       @@ -446,7 +446,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)

     

       328
       328
       +
          # RPATH where Swift runtime can be found.

     

       329
       329
       +
          set(swift_runtime_rpath)

     

       330
       330
       +
        

     

       331
       331
       +
       -  if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       332
       332
       +
       +  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       333
       333
       +
        

     

       334
       334
       +
            set(sdk_dir "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}/usr/lib/swift")

     

       335
       335
       +
        

     

       336
       336
       +
       @@ -529,7 +529,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)

     

       337
       337
       +
        

     

       338
       338
       +
          elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")

     

       339
       339
       +
            set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")

     

       340
       340
       +
       -    if(${ASRLF_BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       341
       341
       +
       +    if(ASRLF_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       342
       342
       +
              # At build time and run time, link against the swift libraries in the

     

       343
       343
       +
              # installed host toolchain.

     

       344
       344
       +
              get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)

     

       345
       345
       +
       @@ -575,7 +575,7 @@ function(_add_swift_runtime_link_flags target relpath_to_lib_dir bootstrapping)

     

       346
       346
       +
            # able to fall back to the SDK directory for libswiftCore et al.

     

       347
       347
       +
            if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       348
       348
       +
              if (NOT "${bootstrapping}" STREQUAL "1")

     

       349
       349
       +
       -        if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       350
       350
       +
       +        if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       351
       351
       +
                  target_link_directories(${target} PRIVATE "${sdk_dir}")

     

       352
       352
       +
        

     

       353
       353
       +
                  # Include the abi stable system stdlib in our rpath.

     

       354
       354
       +
       @@ -706,10 +706,10 @@ function(add_swift_host_library name)

     

       355
       355
       +
          if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       356
       356
       +
            set_target_properties(${name} PROPERTIES

     

       357
       357
       +
              INSTALL_NAME_DIR "@rpath")

     

       358
       358
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL LINUX)

     

       359
       359
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "LINUX")

     

       360
       360
       +
            set_target_properties(${name} PROPERTIES

     

       361
       361
       +
              INSTALL_RPATH "$ORIGIN")

     

       362
       362
       +
       -  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL CYGWIN)

     

       363
       363
       +
       +  elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "CYGWIN")

     

       364
       364
       +
            set_target_properties(${name} PROPERTIES

     

       365
       365
       +
              INSTALL_RPATH "$ORIGIN:/usr/lib/swift/cygwin")

     

       366
       366
       +
          elseif(SWIFT_HOST_VARIANT_SDK STREQUAL "ANDROID")

     

       367
       367
       +
       @@ -731,18 +731,18 @@ function(add_swift_host_library name)

     

       368
       368
       +
          endif()

     

       369
       369
       +
        

     

       370
       370
       +
          # Set compilation and link flags.

     

       371
       371
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       372
       372
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       373
       373
       +
            swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}

     

       374
       374
       +
              ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)

     

       375
       375
       +
            target_include_directories(${name} SYSTEM PRIVATE

     

       376
       376
       +
              ${${SWIFT_HOST_VARIANT_ARCH}_INCLUDE})

     

       377
       377
       +
        

     

       378
       378
       +
       -    if(libkind STREQUAL SHARED)

     

       379
       379
       +
       +    if(libkind STREQUAL "SHARED")

     

       380
       380
       +
              target_compile_definitions(${name} PRIVATE

     

       381
       381
       +
                _WINDLL)

     

       382
       382
       +
            endif()

     

       383
       383
       +
        

     

       384
       384
       +
       -    if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)

     

       385
       385
       +
       +    if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")

     

       386
       386
       +
              swift_windows_get_sdk_vfs_overlay(ASHL_VFS_OVERLAY)

     

       387
       387
       +
              # Both clang and clang-cl on Windows set CMAKE_C_SIMULATE_ID to MSVC.

     

       388
       388
       +
              # We are using CMAKE_C_COMPILER_FRONTEND_VARIANT to detect the correct

     

       389
       389
       +
       @@ -770,7 +770,7 @@ function(add_swift_host_library name)

     

       390
       390
       +
        

     

       391
       391
       +
          set_target_properties(${name} PROPERTIES LINKER_LANGUAGE CXX)

     

       392
       392
       +
        

     

       393
       393
       +
       -  if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       394
       394
       +
       +  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       395
       395
       +
            target_link_options(${name} PRIVATE

     

       396
       396
       +
              "LINKER:-compatibility_version,1")

     

       397
       397
       +
            if(SWIFT_COMPILER_VERSION)

     

       398
       398
       +
       @@ -856,7 +856,7 @@ function(add_swift_host_tool executable)

     

       399
       399
       +
            add_dependencies(${executable} ${LLVM_COMMON_DEPENDS})

     

       400
       400
       +
          endif()

     

       401
       401
       +
        

     

       402
       402
       +
       -  if(NOT ${ASHT_BOOTSTRAPPING} STREQUAL "")

     

       403
       403
       +
       +  if(NOT "${ASHT_BOOTSTRAPPING}" STREQUAL "")

     

       404
       404
       +
            # Strip the "-bootstrapping<n>" suffix from the target name to get the base

     

       405
       405
       +
            # executable name.

     

       406
       406
       +
            string(REGEX REPLACE "-bootstrapping.*" "" executable_filename ${executable})

     

       407
       407
       +
       @@ -891,7 +891,7 @@ function(add_swift_host_tool executable)

     

       408
       408
       +
            BINARY_DIR ${out_bin_dir}

     

       409
       409
       +
            LIBRARY_DIR ${out_lib_dir})

     

       410
       410
       +
        

     

       411
       411
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       412
       412
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       413
       413
       +
            swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}

     

       414
       414
       +
              ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)

     

       415
       415
       +
            target_include_directories(${executable} SYSTEM PRIVATE

     

       416
       416
       +
       @@ -913,8 +913,8 @@ function(add_swift_host_tool executable)

     

       417
       417
       +
        

     

       418
       418
       +
          if(SWIFT_SWIFT_PARSER)

     

       419
       419
       +
            set(extra_relative_rpath "")

     

       420
       420
       +
       -    if(NOT ${ASHT_BOOTSTRAPPING} STREQUAL "")

     

       421
       421
       +
       -      if (${executable} MATCHES "-bootstrapping")

     

       422
       422
       +
       +    if(NOT "${ASHT_BOOTSTRAPPING}" STREQUAL "")

     

       423
       423
       +
       +      if(executable MATCHES "-bootstrapping")

     

       424
       424
       +
                set(extra_relative_rpath "../")

     

       425
       425
       +
              endif()

     

       426
       426
       +
            endif()

     

       427
       427
       +
       @@ -938,7 +938,7 @@ function(add_swift_host_tool executable)

     

       428
       428
       +
            target_link_options(${executable} PRIVATE "${lto_codegen_only_link_options}")

     

       429
       429
       +
          endif()

     

       430
       430
       +
        

     

       431
       431
       +
       -  if(NOT ${ASHT_SWIFT_COMPONENT} STREQUAL "no_component")

     

       432
       432
       +
       +  if(NOT ASHT_SWIFT_COMPONENT STREQUAL "no_component")

     

       433
       433
       +
            add_dependencies(${ASHT_SWIFT_COMPONENT} ${executable})

     

       434
       434
       +
            swift_install_in_component(TARGETS ${executable}

     

       435
       435
       +
                                       RUNTIME

     

       436
       436
       +
       diff --git a/cmake/modules/Libdispatch.cmake b/cmake/modules/Libdispatch.cmake

     

       437
       437
       +
       index f0ea3577a2b..3fb0ecdce89 100644

     

       438
       438
       +
       --- a/cmake/modules/Libdispatch.cmake

     

       439
       439
       +
       +++ b/cmake/modules/Libdispatch.cmake

     

       440
       440
       +
       @@ -1,13 +1,13 @@

     

       441
       441
       +
        include(ExternalProject)

     

       442
       442
       +
        

     

       443
       443
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       444
       444
       +
       -  if(CMAKE_C_COMPILER_ID STREQUAL Clang AND

     

       445
       445
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       446
       446
       +
       +  if(CMAKE_C_COMPILER_ID STREQUAL "Clang" AND

     

       447
       447
       +
            CMAKE_C_COMPILER_VERSION VERSION_GREATER 3.8

     

       448
       448
       +
            OR LLVM_USE_SANITIZER)

     

       449
       449
       +
            set(SWIFT_LIBDISPATCH_C_COMPILER ${CMAKE_C_COMPILER})

     

       450
       450
       +
            set(SWIFT_LIBDISPATCH_CXX_COMPILER ${CMAKE_CXX_COMPILER})

     

       451
       451
       +
       -  elseif(${CMAKE_SYSTEM_NAME} STREQUAL ${CMAKE_HOST_SYSTEM_NAME})

     

       452
       452
       +
       -    if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       453
       453
       +
       +  elseif(CMAKE_SYSTEM_NAME STREQUAL CMAKE_HOST_SYSTEM_NAME)

     

       454
       454
       +
       +    if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       455
       455
       +
              if(CMAKE_SYSTEM_PROCESSOR STREQUAL CMAKE_HOST_SYSTEM_PROCESSOR AND

     

       456
       456
       +
                TARGET clang)

     

       457
       457
       +
                set(SWIFT_LIBDISPATCH_C_COMPILER

     

       458
       458
       +
       @@ -29,7 +29,7 @@ if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       459
       459
       +
            message(SEND_ERROR "libdispatch requires a newer clang compiler (${CMAKE_C_COMPILER_VERSION} < 3.9)")

     

       460
       460
       +
          endif()

     

       461
       461
       +
        

     

       462
       462
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       463
       463
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       464
       464
       +
            set(LIBDISPATCH_RUNTIME_DIR bin)

     

       465
       465
       +
          else()

     

       466
       466
       +
            set(LIBDISPATCH_RUNTIME_DIR lib)

     

       467
       467
       +
       @@ -40,7 +40,7 @@ set(DISPATCH_SDKS)

     

       468
       468
       +
        

     

       469
       469
       +
        # Build the host libdispatch if needed.

     

       470
       470
       +
        if(SWIFT_BUILD_HOST_DISPATCH)

     

       471
       471
       +
       -  if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       472
       472
       +
       +  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       473
       473
       +
            if(NOT "${SWIFT_HOST_VARIANT_SDK}" IN_LIST SWIFT_SDKS)

     

       474
       474
       +
              list(APPEND DISPATCH_SDKS "${SWIFT_HOST_VARIANT_SDK}")

     

       475
       475
       +
            endif()

     

       476
       476
       +
       @@ -52,20 +52,20 @@ foreach(sdk ${SWIFT_SDKS})

     

       477
       477
       +
          # Darwin targets have libdispatch available, do not build it.

     

       478
       478
       +
          # Wasm/WASI doesn't support libdispatch yet.

     

       479
       479
       +
          # See https://github.com/apple/swift/issues/54533 for more details.

     

       480
       480
       +
       -  if(NOT "${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS AND NOT "${sdk}" STREQUAL WASI)

     

       481
       481
       +
       +  if(NOT "${sdk}" IN_LIST SWIFT_DARWIN_PLATFORMS AND NOT "${sdk}" STREQUAL "WASI")

     

       482
       482
       +
            list(APPEND DISPATCH_SDKS "${sdk}")

     

       483
       483
       +
          endif()

     

       484
       484
       +
        endforeach()

     

       485
       485
       +
        

     

       486
       486
       +
        foreach(sdk ${DISPATCH_SDKS})

     

       487
       487
       +
          set(ARCHS ${SWIFT_SDK_${sdk}_ARCHITECTURES})

     

       488
       488
       +
       -  if(${sdk} STREQUAL "${SWIFT_HOST_VARIANT_SDK}")

     

       489
       489
       +
       +  if(sdk STREQUAL "${SWIFT_HOST_VARIANT_SDK}")

     

       490
       490
       +
            if(NOT "${SWIFT_HOST_VARIANT_ARCH}" IN_LIST ARCHS)

     

       491
       491
       +
              list(APPEND ARCHS "${SWIFT_HOST_VARIANT_ARCH}")

     

       492
       492
       +
            endif()

     

       493
       493
       +
          endif()

     

       494
       494
       +
          

     

       495
       495
       +
       -  if(sdk STREQUAL ANDROID)

     

       496
       496
       +
       +  if(sdk STREQUAL "ANDROID")

     

       497
       497
       +
            set(SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS)

     

       498
       498
       +
          else()

     

       499
       499
       +
            set(SWIFT_LIBDISPATCH_COMPILER_CMAKE_ARGS -DCMAKE_C_COMPILER=${SWIFT_LIBDISPATCH_C_COMPILER};-DCMAKE_CXX_COMPILER=${SWIFT_LIBDISPATCH_CXX_COMPILER})

     

       500
       500
       +
       diff --git a/cmake/modules/SwiftComponents.cmake b/cmake/modules/SwiftComponents.cmake

     

       501
       501
       +
       index 6816b75e8a4..2ec225140dc 100644

     

       502
       502
       +
       --- a/cmake/modules/SwiftComponents.cmake

     

       503
       503
       +
       +++ b/cmake/modules/SwiftComponents.cmake

     

       504
       504
       +
       @@ -82,7 +82,7 @@ list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "clang-builtin-headers-in-clang-resou

     

       505
       505
       +
        # This conflicts with LLVM itself when doing unified builds.

     

       506
       506
       +
        list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "llvm-toolchain-dev-tools")

     

       507
       507
       +
        # The sourcekit install variants are currently mutually exclusive.

     

       508
       508
       +
       -if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

     

       509
       509
       +
       +if(CMAKE_SYSTEM_NAME MATCHES "Darwin")

     

       510
       510
       +
          list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-inproc")

     

       511
       511
       +
        else()

     

       512
       512
       +
          list(REMOVE_ITEM _SWIFT_DEFAULT_COMPONENTS "sourcekit-xpc-service")

     

       513
       513
       +
       diff --git a/cmake/modules/SwiftConfigureSDK.cmake b/cmake/modules/SwiftConfigureSDK.cmake

     

       514
       514
       +
       index d4cb352d658..5dd258cdd24 100644

     

       515
       515
       +
       --- a/cmake/modules/SwiftConfigureSDK.cmake

     

       516
       516
       +
       +++ b/cmake/modules/SwiftConfigureSDK.cmake

     

       517
       517
       +
       @@ -232,7 +232,7 @@ macro(configure_sdk_darwin

     

       518
       518
       +
            SWIFT_SDK_${prefix}_MODULE_ARCHITECTURES)     # result

     

       519
       519
       +
        

     

       520
       520
       +
          # Determine whether this is a simulator SDK.

     

       521
       521
       +
       -  if ( ${xcrun_name} MATCHES "simulator" )

     

       522
       522
       +
       +  if(xcrun_name MATCHES "simulator")

     

       523
       523
       +
            set(SWIFT_SDK_${prefix}_IS_SIMULATOR TRUE)

     

       524
       524
       +
          else()

     

       525
       525
       +
            set(SWIFT_SDK_${prefix}_IS_SIMULATOR FALSE)

     

       526
       526
       +
       @@ -378,11 +378,11 @@ macro(configure_sdk_unix name architectures)

     

       527
       527
       +
                  message(FATAL_ERROR "unknown arch for ${prefix}: ${arch}")

     

       528
       528
       +
                endif()

     

       529
       529
       +
              elseif("${prefix}" STREQUAL "FREEBSD")

     

       530
       530
       +
       -        if(NOT arch STREQUAL x86_64)

     

       531
       531
       +
       +        if(NOT arch STREQUAL "x86_64")

     

       532
       532
       +
                  message(FATAL_ERROR "unsupported arch for FreeBSD: ${arch}")

     

       533
       533
       +
                endif()

     

       534
       534
       +
        

     

       535
       535
       +
       -        if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL FreeBSD)

     

       536
       536
       +
       +        if(NOT CMAKE_HOST_SYSTEM_NAME STREQUAL "FreeBSD")

     

       537
       537
       +
                  message(WARNING "CMAKE_SYSTEM_VERSION will not match target")

     

       538
       538
       +
                endif()

     

       539
       539
       +
        

     

       540
       540
       +
       @@ -391,7 +391,7 @@ macro(configure_sdk_unix name architectures)

     

       541
       541
       +
        

     

       542
       542
       +
                set(SWIFT_SDK_FREEBSD_ARCH_x86_64_TRIPLE "x86_64-unknown-freebsd${freebsd_system_version}")

     

       543
       543
       +
              elseif("${prefix}" STREQUAL "OPENBSD")

     

       544
       544
       +
       -        if(NOT arch STREQUAL amd64)

     

       545
       545
       +
       +        if(NOT arch STREQUAL "amd64")

     

       546
       546
       +
                  message(FATAL_ERROR "unsupported arch for OpenBSD: ${arch}")

     

       547
       547
       +
                endif()

     

       548
       548
       +
        

     

       549
       549
       +
       @@ -404,17 +404,17 @@ macro(configure_sdk_unix name architectures)

     

       550
       550
       +
                  set(SWIFT_SDK_OPENBSD_ARCH_${arch}_PATH "${CMAKE_SYSROOT}${SWIFT_SDK_OPENBSD_ARCH_${arch}_PATH}" CACHE INTERNAL "sysroot path" FORCE)

     

       551
       551
       +
                endif()

     

       552
       552
       +
              elseif("${prefix}" STREQUAL "CYGWIN")

     

       553
       553
       +
       -        if(NOT arch STREQUAL x86_64)

     

       554
       554
       +
       +        if(NOT arch STREQUAL "x86_64")

     

       555
       555
       +
                  message(FATAL_ERROR "unsupported arch for cygwin: ${arch}")

     

       556
       556
       +
                endif()

     

       557
       557
       +
                set(SWIFT_SDK_CYGWIN_ARCH_x86_64_TRIPLE "x86_64-unknown-windows-cygnus")

     

       558
       558
       +
              elseif("${prefix}" STREQUAL "HAIKU")

     

       559
       559
       +
       -        if(NOT arch STREQUAL x86_64)

     

       560
       560
       +
       +        if(NOT arch STREQUAL "x86_64")

     

       561
       561
       +
                  message(FATAL_ERROR "unsupported arch for Haiku: ${arch}")

     

       562
       562
       +
                endif()

     

       563
       563
       +
                set(SWIFT_SDK_HAIKU_ARCH_x86_64_TRIPLE "x86_64-unknown-haiku")

     

       564
       564
       +
              elseif("${prefix}" STREQUAL "WASI")

     

       565
       565
       +
       -        if(NOT arch STREQUAL wasm32)

     

       566
       566
       +
       +        if(NOT arch STREQUAL "wasm32")

     

       567
       567
       +
                  message(FATAL_ERROR "unsupported arch for WebAssembly: ${arch}")

     

       568
       568
       +
                endif()

     

       569
       569
       +
                set(SWIFT_SDK_WASI_ARCH_wasm32_PATH "${SWIFT_WASI_SYSROOT_PATH}")

     

       570
       570
       +
       @@ -459,7 +459,7 @@ macro(configure_sdk_windows name environment architectures)

     

       571
       571
       +
          get_threading_package(${prefix} "win32" SWIFT_SDK_${prefix}_THREADING_PACKAGE)

     

       572
       572
       +
        

     

       573
       573
       +
          foreach(arch ${architectures})

     

       574
       574
       +
       -    if(arch STREQUAL armv7)

     

       575
       575
       +
       +    if(arch STREQUAL "armv7")

     

       576
       576
       +
              set(SWIFT_SDK_${prefix}_ARCH_${arch}_TRIPLE

     

       577
       577
       +
                  "thumbv7-unknown-windows-${environment}")

     

       578
       578
       +
            else()

     

       579
       579
       +
       diff --git a/cmake/modules/SwiftWindowsSupport.cmake b/cmake/modules/SwiftWindowsSupport.cmake

     

       580
       580
       +
       index 6216b82c12b..a3432476658 100644

     

       581
       581
       +
       --- a/cmake/modules/SwiftWindowsSupport.cmake

     

       582
       582
       +
       +++ b/cmake/modules/SwiftWindowsSupport.cmake

     

       583
       583
       +
       @@ -2,13 +2,13 @@

     

       584
       584
       +
        include(SwiftUtils)

     

       585
       585
       +
        

     

       586
       586
       +
        function(swift_windows_arch_spelling arch var)

     

       587
       587
       +
       -  if(${arch} STREQUAL i686)

     

       588
       588
       +
       +  if(arch STREQUAL "i686")

     

       589
       589
       +
            set(${var} x86 PARENT_SCOPE)

     

       590
       590
       +
       -  elseif(${arch} STREQUAL x86_64)

     

       591
       591
       +
       +  elseif(arch STREQUAL "x86_64")

     

       592
       592
       +
            set(${var} x64 PARENT_SCOPE)

     

       593
       593
       +
       -  elseif(${arch} STREQUAL armv7)

     

       594
       594
       +
       +  elseif(arch STREQUAL "armv7")

     

       595
       595
       +
            set(${var} arm PARENT_SCOPE)

     

       596
       596
       +
       -  elseif(${arch} STREQUAL aarch64)

     

       597
       597
       +
       +  elseif(arch STREQUAL "aarch64")

     

       598
       598
       +
            set(${var} arm64 PARENT_SCOPE)

     

       599
       599
       +
          else()

     

       600
       600
       +
            message(FATAL_ERROR "do not know MSVC spelling for ARCH: `${arch}`")

     

       601
       601
       +
       @@ -33,7 +33,7 @@ function(swift_windows_lib_for_arch arch var)

     

       602
       602
       +
          # a directory called "Lib" rather than VS2017 which normalizes the layout and

     

       603
       603
       +
          # places them in a directory named "lib".

     

       604
       604
       +
          if(IS_DIRECTORY "${VCToolsInstallDir}/Lib")

     

       605
       605
       +
       -    if(${ARCH} STREQUAL x86)

     

       606
       606
       +
       +    if(ARCH STREQUAL "x86")

     

       607
       607
       +
              list(APPEND paths "${VCToolsInstallDir}/Lib/")

     

       608
       608
       +
            else()

     

       609
       609
       +
              list(APPEND paths "${VCToolsInstallDir}/Lib/${ARCH}")

     

       610
       610
       +
       diff --git a/include/swift/AST/CMakeLists.txt b/include/swift/AST/CMakeLists.txt

     

       611
       611
       +
       index 869d96ba13b..050695f65c6 100644

     

       612
       612
       +
       --- a/include/swift/AST/CMakeLists.txt

     

       613
       613
       +
       +++ b/include/swift/AST/CMakeLists.txt

     

       614
       614
       +
       @@ -1,4 +1,4 @@

     

       615
       615
       +
       -if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       616
       616
       +
       +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       617
       617
       +
          set(SWIFT_GYB_FLAGS --line-directive "^\"#line %(line)d \\\"%(file)s\\\"^\"")

     

       618
       618
       +
        else()

     

       619
       619
       +
          set(SWIFT_GYB_FLAGS --line-directive "\'#line" "%(line)d" "\"%(file)s\"\'")

     

       620
       620
       +
       diff --git a/lib/AST/CMakeLists.txt b/lib/AST/CMakeLists.txt

     

       621
       621
       +
       index a0011d8a68c..13363dea4aa 100644

     

       622
       622
       +
       --- a/lib/AST/CMakeLists.txt

     

       623
       623
       +
       +++ b/lib/AST/CMakeLists.txt

     

       624
       624
       +
       @@ -125,7 +125,7 @@ add_swift_host_library(swiftAST STATIC

     

       625
       625
       +
          )

     

       626
       626
       +
        

     

       627
       627
       +
        if(SWIFT_FORCE_OPTIMIZED_TYPECHECKER)

     

       628
       628
       +
       -  if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)

     

       629
       629
       +
       +  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")

     

       630
       630
       +
            target_compile_options(swiftAST PRIVATE /O2 /Ob2)

     

       631
       631
       +
          else()

     

       632
       632
       +
            target_compile_options(swiftAST PRIVATE -O3)

     

       633
       633
       +
       diff --git a/lib/Migrator/CMakeLists.txt b/lib/Migrator/CMakeLists.txt

     

       634
       634
       +
       index 1dfd089d21a..228baa470ed 100644

     

       635
       635
       +
       --- a/lib/Migrator/CMakeLists.txt

     

       636
       636
       +
       +++ b/lib/Migrator/CMakeLists.txt

     

       637
       637
       +
       @@ -23,7 +23,7 @@ set(outputs)

     

       638
       638
       +
        foreach(input ${datafiles})

     

       639
       639
       +
          set(source "${CMAKE_CURRENT_SOURCE_DIR}/${input}")

     

       640
       640
       +
          set(dest "${output_dir}/${input}")

     

       641
       641
       +
       -  if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       642
       642
       +
       +  if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       643
       643
       +
            set(CMAKE_SYMLINK_COMMAND copy)

     

       644
       644
       +
          else()

     

       645
       645
       +
            set(CMAKE_SYMLINK_COMMAND create_symlink)

     

       646
       646
       +
       diff --git a/lib/Parse/CMakeLists.txt b/lib/Parse/CMakeLists.txt

     

       647
       647
       +
       index b46a4b217c3..b8550c96b2a 100644

     

       648
       648
       +
       --- a/lib/Parse/CMakeLists.txt

     

       649
       649
       +
       +++ b/lib/Parse/CMakeLists.txt

     

       650
       650
       +
       @@ -1,6 +1,6 @@

     

       651
       651
       +
        

     

       652
       652
       +
        

     

       653
       653
       +
       -if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       654
       654
       +
       +if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       655
       655
       +
          set(SWIFT_GYB_FLAGS --line-directive "^\"#line %(line)d \\\"%(file)s\\\"^\"")

     

       656
       656
       +
        else()

     

       657
       657
       +
          set(SWIFT_GYB_FLAGS --line-directive "\'#line" "%(line)d" "\"%(file)s\"\'")

     

       658
       658
       +
       diff --git a/lib/Sema/CMakeLists.txt b/lib/Sema/CMakeLists.txt

     

       659
       659
       +
       index c0e3608d07a..bf70a33782d 100644

     

       660
       660
       +
       --- a/lib/Sema/CMakeLists.txt

     

       661
       661
       +
       +++ b/lib/Sema/CMakeLists.txt

     

       662
       662
       +
       @@ -74,7 +74,7 @@ add_swift_host_library(swiftSema STATIC

     

       663
       663
       +
          TypeChecker.cpp

     

       664
       664
       +
          IDETypeCheckingRequests.cpp)

     

       665
       665
       +
        if(SWIFT_FORCE_OPTIMIZED_TYPECHECKER)

     

       666
       666
       +
       -  if(CMAKE_CXX_COMPILER_ID STREQUAL MSVC OR CMAKE_CXX_SIMULATE_ID STREQUAL MSVC)

     

       667
       667
       +
       +  if(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC" OR CMAKE_CXX_SIMULATE_ID STREQUAL "MSVC")

     

       668
       668
       +
            target_compile_options(swiftSema PRIVATE /O2 /Ob2)

     

       669
       669
       +
          else()

     

       670
       670
       +
            target_compile_options(swiftSema PRIVATE -O3)

     

       671
       671
       +
       diff --git a/lib/SwiftRemoteMirror/CMakeLists.txt b/lib/SwiftRemoteMirror/CMakeLists.txt

     

       672
       672
       +
       index f774297e51c..da2248de9f7 100644

     

       673
       673
       +
       --- a/lib/SwiftRemoteMirror/CMakeLists.txt

     

       674
       674
       +
       +++ b/lib/SwiftRemoteMirror/CMakeLists.txt

     

       675
       675
       +
       @@ -3,6 +3,6 @@ add_swift_host_library(swiftRemoteMirror STATIC

     

       676
       676
       +
        target_link_libraries(swiftRemoteMirror PRIVATE

     

       677
       677
       +
          swiftDemangling)

     

       678
       678
       +
        

     

       679
       679
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       680
       680
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       681
       681
       +
          target_compile_definitions(swiftRemoteMirror PRIVATE _LIB)

     

       682
       682
       +
        endif()

     

       683
       683
       +
       diff --git a/stdlib/cmake/modules/AddSwiftStdlib.cmake b/stdlib/cmake/modules/AddSwiftStdlib.cmake

     

       684
       684
       +
       index 25a79d145fb..781d6fd33cf 100644

     

       685
       685
       +
       --- a/stdlib/cmake/modules/AddSwiftStdlib.cmake

     

       686
       686
       +
       +++ b/stdlib/cmake/modules/AddSwiftStdlib.cmake

     

       687
       687
       +
       @@ -249,7 +249,7 @@ function(_add_target_variant_c_compile_flags)

     

       688
       688
       +
            # NOTE(compnerd) workaround LLVM invoking `add_definitions(-D_DEBUG)` which

     

       689
       689
       +
            # causes failures for the runtime library when cross-compiling due to

     

       690
       690
       +
            # undefined symbols from the standard library.

     

       691
       691
       +
       -    if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)

     

       692
       692
       +
       +    if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       693
       693
       +
              list(APPEND result "-U_DEBUG")

     

       694
       694
       +
            endif()

     

       695
       695
       +
          endif()

     

       696
       696
       +
       @@ -258,7 +258,7 @@ function(_add_target_variant_c_compile_flags)

     

       697
       697
       +
          # uses a spin lock for this, so to get reasonable behavior we have to

     

       698
       698
       +
          # implement it ourselves using _InterlockedCompareExchange128.

     

       699
       699
       +
          # clang-cl requires us to enable the `cx16` feature to use this intrinsic.

     

       700
       700
       +
       -  if(CFLAGS_ARCH STREQUAL x86_64)

     

       701
       701
       +
       +  if(CFLAGS_ARCH STREQUAL "x86_64")

     

       702
       702
       +
            if(SWIFT_COMPILER_IS_MSVC_LIKE)

     

       703
       703
       +
              list(APPEND result /clang:-mcx16)

     

       704
       704
       +
            else()

     

       705
       705
       +
       @@ -287,7 +287,7 @@ function(_add_target_variant_c_compile_flags)

     

       706
       706
       +
          endif()

     

       707
       707
       +
        

     

       708
       708
       +
          if("${CFLAGS_SDK}" STREQUAL "LINUX")

     

       709
       709
       +
       -    if(${CFLAGS_ARCH} STREQUAL x86_64)

     

       710
       710
       +
       +    if("${CFLAGS_ARCH}" STREQUAL "x86_64")

     

       711
       711
       +
              # this is the minimum architecture that supports 16 byte CAS, which is necessary to avoid a dependency to libatomic

     

       712
       712
       +
              list(APPEND result "-march=core2")

     

       713
       713
       +
            endif()

     

       714
       714
       +
       @@ -493,7 +493,7 @@ function(_add_target_variant_link_flags)

     

       715
       715
       +
            else()

     

       716
       716
       +
              set(linker "${SWIFT_USE_LINKER}")

     

       717
       717
       +
            endif()

     

       718
       718
       +
       -    if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       719
       719
       +
       +    if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       720
       720
       +
              list(APPEND result "-fuse-ld=${linker}.exe")

     

       721
       721
       +
            else()

     

       722
       722
       +
              list(APPEND result "-fuse-ld=${linker}")

     

       723
       723
       +
       @@ -506,8 +506,8 @@ function(_add_target_variant_link_flags)

     

       724
       724
       +
          #

     

       725
       725
       +
          # TODO: Evaluate/enable -f{function,data}-sections --gc-sections for bfd,

     

       726
       726
       +
          # gold, and lld.

     

       727
       727
       +
       -  if(NOT CMAKE_BUILD_TYPE STREQUAL Debug)

     

       728
       728
       +
       -    if(${CMAKE_SYSTEM_NAME} MATCHES "Darwin")

     

       729
       729
       +
       +  if(NOT CMAKE_BUILD_TYPE STREQUAL "Debug")

     

       730
       730
       +
       +    if(CMAKE_SYSTEM_NAME MATCHES "Darwin")

     

       731
       731
       +
              # See rdar://48283130: This gives 6MB+ size reductions for swift and

     

       732
       732
       +
              # SourceKitService, and much larger size reductions for sil-opt etc.

     

       733
       733
       +
              list(APPEND result "-Wl,-dead_strip")

     

       734
       734
       +
       @@ -969,7 +969,7 @@ function(add_swift_target_library_single target name)

     

       735
       735
       +
          endif()

     

       736
       736
       +
        

     

       737
       737
       +
          set(INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS})

     

       738
       738
       +
       -  if(${libkind} STREQUAL "SHARED")

     

       739
       739
       +
       +  if(libkind STREQUAL "SHARED")

     

       740
       740
       +
            list(APPEND INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS

     

       741
       741
       +
                 ${SWIFTLIB_INCORPORATED_OBJECT_LIBRARIES_EXPRESSIONS_SHARED_ONLY})

     

       742
       742
       +
          endif()

     

       743
       743
       +
       @@ -991,7 +991,7 @@ function(add_swift_target_library_single target name)

     

       744
       744
       +
              # target_sources(${target}

     

       745
       745
       +
              #                PRIVATE

     

       746
       746
       +
              #                  $<TARGET_OBJECTS:swiftImageRegistrationObject${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFTLIB_SINGLE_SDK}_LIB_SUBDIR}-${SWIFTLIB_SINGLE_ARCHITECTURE}>)

     

       747
       747
       +
       -      if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS)

     

       748
       748
       +
       +      if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS")

     

       749
       749
       +
                set(extension .obj)

     

       750
       750
       +
              else()

     

       751
       751
       +
                set(extension .o)

     

       752
       752
       +
       @@ -1059,8 +1059,8 @@ function(add_swift_target_library_single target name)

     

       753
       753
       +
          set_target_properties("${target}" PROPERTIES

     

       754
       754
       +
            LIBRARY_OUTPUT_DIRECTORY ${swiftlib_prefix}/${output_sub_dir}

     

       755
       755
       +
            ARCHIVE_OUTPUT_DIRECTORY ${swiftlib_prefix}/${output_sub_dir})

     

       756
       756
       +
       -  if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND SWIFTLIB_SINGLE_IS_STDLIB_CORE

     

       757
       757
       +
       -      AND libkind STREQUAL SHARED)

     

       758
       758
       +
       +  if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS" AND SWIFTLIB_SINGLE_IS_STDLIB_CORE

     

       759
       759
       +
       +      AND libkind STREQUAL "SHARED")

     

       760
       760
       +
            add_custom_command(TARGET ${target} POST_BUILD

     

       761
       761
       +
              COMMAND ${CMAKE_COMMAND} -E copy_if_different $<TARGET_FILE:${target}> ${swiftlib_prefix}/${output_sub_dir})

     

       762
       762
       +
          endif()

     

       763
       763
       +
       @@ -1264,8 +1264,8 @@ function(add_swift_target_library_single target name)

     

       764
       764
       +
            MACCATALYST_BUILD_FLAVOR "${SWIFTLIB_SINGLE_MACCATALYST_BUILD_FLAVOR}"

     

       765
       765
       +
            )

     

       766
       766
       +
        

     

       767
       767
       +
       -  if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS)

     

       768
       768
       +
       -    if(libkind STREQUAL SHARED)

     

       769
       769
       +
       +  if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS")

     

       770
       770
       +
       +    if(libkind STREQUAL "SHARED")

     

       771
       771
       +
              list(APPEND c_compile_flags -D_WINDLL)

     

       772
       772
       +
            endif()

     

       773
       773
       +
          endif()

     

       774
       774
       +
       @@ -1324,13 +1324,13 @@ function(add_swift_target_library_single target name)

     

       775
       775
       +
          endif()

     

       776
       776
       +
        

     

       777
       777
       +
          # Set compilation and link flags.

     

       778
       778
       +
       -  if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS)

     

       779
       779
       +
       +  if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS")

     

       780
       780
       +
            swift_windows_include_for_arch(${SWIFTLIB_SINGLE_ARCHITECTURE}

     

       781
       781
       +
              ${SWIFTLIB_SINGLE_ARCHITECTURE}_INCLUDE)

     

       782
       782
       +
            target_include_directories(${target} SYSTEM PRIVATE

     

       783
       783
       +
              ${${SWIFTLIB_SINGLE_ARCHITECTURE}_INCLUDE})

     

       784
       784
       +
        

     

       785
       785
       +
       -    if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)

     

       786
       786
       +
       +    if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")

     

       787
       787
       +
              swift_windows_get_sdk_vfs_overlay(SWIFTLIB_SINGLE_VFS_OVERLAY)

     

       788
       788
       +
              target_compile_options(${target} PRIVATE

     

       789
       789
       +
                "SHELL:-Xclang -ivfsoverlay -Xclang ${SWIFTLIB_SINGLE_VFS_OVERLAY}")

     

       790
       790
       +
       @@ -1347,7 +1347,7 @@ function(add_swift_target_library_single target name)

     

       791
       791
       +
            ${c_compile_flags})

     

       792
       792
       +
          target_link_options(${target} PRIVATE

     

       793
       793
       +
            ${link_flags})

     

       794
       794
       +
       -  if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       795
       795
       +
       +  if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       796
       796
       +
            target_link_options(${target} PRIVATE

     

       797
       797
       +
              "LINKER:-compatibility_version,1")

     

       798
       798
       +
            if(SWIFT_COMPILER_VERSION)

     

       799
       799
       +
       @@ -1380,7 +1380,7 @@ function(add_swift_target_library_single target name)

     

       800
       800
       +
            list(APPEND swiftlib_link_flags_all "-Xlinker -no_warn_inits")

     

       801
       801
       +
          endif()

     

       802
       802
       +
        

     

       803
       803
       +
       -  if(${SWIFTLIB_SINGLE_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)

     

       804
       804
       +
       +  if(SWIFTLIB_SINGLE_SDK IN_LIST SWIFT_APPLE_PLATFORMS)

     

       805
       805
       +
            # In the past, we relied on unsetting globally

     

       806
       806
       +
            # CMAKE_OSX_ARCHITECTURES to ensure that CMake

     

       807
       807
       +
            # would not add the -arch flag. This is no longer

     

       808
       808
       +
       @@ -1403,7 +1403,7 @@ function(add_swift_target_library_single target name)

     

       809
       809
       +
          # doing so will result in incorrect symbol resolution and linkage.  We created

     

       810
       810
       +
          # import library targets when the library was added.  Use that to adjust the

     

       811
       811
       +
          # link libraries.

     

       812
       812
       +
       -  if(SWIFTLIB_SINGLE_SDK STREQUAL WINDOWS AND NOT CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       813
       813
       +
       +  if(SWIFTLIB_SINGLE_SDK STREQUAL "WINDOWS" AND NOT CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       814
       814
       +
            foreach(library_list LINK_LIBRARIES PRIVATE_LINK_LIBRARIES)

     

       815
       815
       +
              set(import_libraries)

     

       816
       816
       +
              foreach(library ${SWIFTLIB_SINGLE_${library_list}})

     

       817
       817
       +
       @@ -1415,7 +1415,7 @@ function(add_swift_target_library_single target name)

     

       818
       818
       +
                set(import_library ${library})

     

       819
       819
       +
                if(TARGET ${library})

     

       820
       820
       +
                  get_target_property(type ${library} TYPE)

     

       821
       821
       +
       -          if(${type} STREQUAL "SHARED_LIBRARY")

     

       822
       822
       +
       +          if(type STREQUAL "SHARED_LIBRARY")

     

       823
       823
       +
                    set(import_library ${library}_IMPLIB)

     

       824
       824
       +
                  endif()

     

       825
       825
       +
                endif()

     

       826
       826
       +
       @@ -1744,7 +1744,7 @@ function(add_swift_target_library name)

     

       827
       827
       +
            list(APPEND SWIFTLIB_SWIFT_MODULE_DEPENDS Core)

     

       828
       828
       +
        

     

       829
       829
       +
            # swiftSwiftOnoneSupport does not depend on itself, obviously.

     

       830
       830
       +
       -    if(NOT ${name} STREQUAL swiftSwiftOnoneSupport)

     

       831
       831
       +
       +    if(NOT name STREQUAL "swiftSwiftOnoneSupport")

     

       832
       832
       +
              # All Swift code depends on the SwiftOnoneSupport in non-optimized mode,

     

       833
       833
       +
              # except for the standard library itself.

     

       834
       834
       +
              is_build_type_optimized("${SWIFT_STDLIB_BUILD_TYPE}" optimized)

     

       835
       835
       +
       @@ -1851,7 +1851,7 @@ function(add_swift_target_library name)

     

       836
       836
       +
        

     

       837
       837
       +
            # Collect architecture agnostic SDK module dependencies

     

       838
       838
       +
            set(swiftlib_module_depends_flattened ${SWIFTLIB_SWIFT_MODULE_DEPENDS})

     

       839
       839
       +
       -    if(${sdk} STREQUAL OSX)

     

       840
       840
       +
       +    if(sdk STREQUAL "OSX")

     

       841
       841
       +
               if(DEFINED maccatalyst_build_flavor AND NOT maccatalyst_build_flavor STREQUAL "macos-like")

     

       842
       842
       +
                  list(APPEND swiftlib_module_depends_flattened

     

       843
       843
       +
                    ${SWIFTLIB_SWIFT_MODULE_DEPENDS_MACCATALYST})

     

       844
       844
       +
       @@ -1863,70 +1863,70 @@ function(add_swift_target_library name)

     

       845
       845
       +
                endif()

     

       846
       846
       +
              list(APPEND swiftlib_module_depends_flattened

     

       847
       847
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_OSX})

     

       848
       848
       +
       -    elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR)

     

       849
       849
       +
       +    elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR")

     

       850
       850
       +
              list(APPEND swiftlib_module_depends_flattened

     

       851
       851
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_IOS})

     

       852
       852
       +
       -    elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR)

     

       853
       853
       +
       +    elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR")

     

       854
       854
       +
              list(APPEND swiftlib_module_depends_flattened

     

       855
       855
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_TVOS})

     

       856
       856
       +
       -    elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR)

     

       857
       857
       +
       +    elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR")

     

       858
       858
       +
              list(APPEND swiftlib_module_depends_flattened

     

       859
       859
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WATCHOS})

     

       860
       860
       +
       -    elseif(${sdk} STREQUAL FREESTANDING)

     

       861
       861
       +
       +    elseif(sdk STREQUAL "FREESTANDING")

     

       862
       862
       +
              list(APPEND swiftlib_module_depends_flattened

     

       863
       863
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_FREESTANDING})

     

       864
       864
       +
       -    elseif(${sdk} STREQUAL FREEBSD)

     

       865
       865
       +
       +    elseif(sdk STREQUAL "FREEBSD")

     

       866
       866
       +
              list(APPEND swiftlib_module_depends_flattened

     

       867
       867
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_FREEBSD})

     

       868
       868
       +
       -    elseif(${sdk} STREQUAL OPENBSD)

     

       869
       869
       +
       +    elseif(sdk STREQUAL "OPENBSD")

     

       870
       870
       +
              list(APPEND swiftlib_module_depends_flattened

     

       871
       871
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_OPENBSD})

     

       872
       872
       +
       -    elseif(${sdk} STREQUAL LINUX OR ${sdk} STREQUAL ANDROID)

     

       873
       873
       +
       +    elseif(sdk STREQUAL "LINUX" OR sdk STREQUAL "ANDROID")

     

       874
       874
       +
              list(APPEND swiftlib_module_depends_flattened

     

       875
       875
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_LINUX})

     

       876
       876
       +
       -    elseif(${sdk} STREQUAL CYGWIN)

     

       877
       877
       +
       +    elseif(sdk STREQUAL "CYGWIN")

     

       878
       878
       +
              list(APPEND swiftlib_module_depends_flattened

     

       879
       879
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_CYGWIN})

     

       880
       880
       +
       -    elseif(${sdk} STREQUAL HAIKU)

     

       881
       881
       +
       +    elseif(sdk STREQUAL "HAIKU")

     

       882
       882
       +
              list(APPEND swiftlib_module_depends_flattened

     

       883
       883
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_HAIKU})

     

       884
       884
       +
       -    elseif(${sdk} STREQUAL WASI)

     

       885
       885
       +
       +    elseif(sdk STREQUAL "WASI")

     

       886
       886
       +
              list(APPEND swiftlib_module_depends_flattened

     

       887
       887
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WASI})

     

       888
       888
       +
       -    elseif(${sdk} STREQUAL WINDOWS)

     

       889
       889
       +
       +    elseif(sdk STREQUAL "WINDOWS")

     

       890
       890
       +
              list(APPEND swiftlib_module_depends_flattened

     

       891
       891
       +
                   ${SWIFTLIB_SWIFT_MODULE_DEPENDS_WINDOWS})

     

       892
       892
       +
            endif()

     

       893
       893
       +
        

     

       894
       894
       +
            # Collect architecture agnostic SDK framework dependencies

     

       895
       895
       +
            set(swiftlib_framework_depends_flattened ${SWIFTLIB_FRAMEWORK_DEPENDS})

     

       896
       896
       +
       -    if(${sdk} STREQUAL OSX)

     

       897
       897
       +
       +    if(sdk STREQUAL "OSX")

     

       898
       898
       +
              list(APPEND swiftlib_framework_depends_flattened

     

       899
       899
       +
                   ${SWIFTLIB_FRAMEWORK_DEPENDS_OSX})

     

       900
       900
       +
       -    elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR OR

     

       901
       901
       +
       -           ${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR)

     

       902
       902
       +
       +    elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR" OR

     

       903
       903
       +
       +           sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR")

     

       904
       904
       +
              list(APPEND swiftlib_framework_depends_flattened

     

       905
       905
       +
                   ${SWIFTLIB_FRAMEWORK_DEPENDS_IOS_TVOS})

     

       906
       906
       +
            endif()

     

       907
       907
       +
        

     

       908
       908
       +
            # Collect architecture agnostic swift compiler flags

     

       909
       909
       +
            set(swiftlib_swift_compile_flags_all ${SWIFTLIB_SWIFT_COMPILE_FLAGS})

     

       910
       910
       +
       -    if(${sdk} STREQUAL OSX)

     

       911
       911
       +
       +    if(sdk STREQUAL "OSX")

     

       912
       912
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       913
       913
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_OSX})

     

       914
       914
       +
       -    elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR)

     

       915
       915
       +
       +    elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR")

     

       916
       916
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       917
       917
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_IOS})

     

       918
       918
       +
       -    elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR)

     

       919
       919
       +
       +    elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR")

     

       920
       920
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       921
       921
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_TVOS})

     

       922
       922
       +
       -    elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR)

     

       923
       923
       +
       +    elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR")

     

       924
       924
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       925
       925
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_WATCHOS})

     

       926
       926
       +
       -    elseif(${sdk} STREQUAL LINUX)

     

       927
       927
       +
       +    elseif(sdk STREQUAL "LINUX")

     

       928
       928
       +
              list(APPEND swiftlib_swift_compile_flags_all

     

       929
       929
       +
                   ${SWIFTLIB_SWIFT_COMPILE_FLAGS_LINUX})

     

       930
       930
       +
       -    elseif(${sdk} STREQUAL WINDOWS)

     

       931
       931
       +
       +    elseif(sdk STREQUAL "WINDOWS")

     

       932
       932
       +
              # FIXME: https://github.com/apple/swift/issues/44614

     

       933
       933
       +
              # static and shared are not mutually exclusive; however since we do a

     

       934
       934
       +
              # single build of the sources, this doesn't work for building both

     

       935
       935
       +
       @@ -1945,7 +1945,7 @@ function(add_swift_target_library name)

     

       936
       936
       +
        

     

       937
       937
       +
            # Collect architecture agnostic SDK linker flags

     

       938
       938
       +
            set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})

     

       939
       939
       +
       -    if(${sdk} STREQUAL IOS_SIMULATOR AND ${name} STREQUAL swiftMediaPlayer)

     

       940
       940
       +
       +    if(sdk STREQUAL "IOS_SIMULATOR" AND name STREQUAL "swiftMediaPlayer")

     

       941
       941
       +
              # message("DISABLING AUTOLINK FOR swiftMediaPlayer")

     

       942
       942
       +
              list(APPEND swiftlib_link_flags_all "-Xlinker" "-ignore_auto_link")

     

       943
       943
       +
            endif()

     

       944
       944
       +
       @@ -1959,8 +1959,8 @@ function(add_swift_target_library name)

     

       945
       945
       +
            # back to supported targets and libraries only.  This is needed for ELF

     

       946
       946
       +
            # targets only; however, RemoteMirror needs to build with undefined

     

       947
       947
       +
            # symbols.

     

       948
       948
       +
       -    if(${SWIFT_SDK_${sdk}_OBJECT_FORMAT} STREQUAL ELF AND

     

       949
       949
       +
       -       NOT ${name} STREQUAL swiftRemoteMirror)

     

       950
       950
       +
       +    if(SWIFT_SDK_${sdk}_OBJECT_FORMAT STREQUAL "ELF" AND

     

       951
       951
       +
       +       NOT name STREQUAL "swiftRemoteMirror")

     

       952
       952
       +
              list(APPEND swiftlib_link_flags_all "-Wl,-z,defs")

     

       953
       953
       +
            endif()

     

       954
       954
       +
            # Setting back linker flags which are not supported when making Android build on macOS cross-compile host.

     

       955
       955
       +
       @@ -2067,22 +2067,22 @@ function(add_swift_target_library name)

     

       956
       956
       +
              set(swiftlib_link_flags_all ${SWIFTLIB_LINK_FLAGS})

     

       957
       957
       +
        

     

       958
       958
       +
              # Collect architecture agnostic c compiler flags

     

       959
       959
       +
       -      if(${sdk} STREQUAL OSX)

     

       960
       960
       +
       +      if(sdk STREQUAL "OSX")

     

       961
       961
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       962
       962
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_OSX})

     

       963
       963
       +
       -      elseif(${sdk} STREQUAL IOS OR ${sdk} STREQUAL IOS_SIMULATOR)

     

       964
       964
       +
       +      elseif(sdk STREQUAL "IOS" OR sdk STREQUAL "IOS_SIMULATOR")

     

       965
       965
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       966
       966
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_IOS})

     

       967
       967
       +
       -      elseif(${sdk} STREQUAL TVOS OR ${sdk} STREQUAL TVOS_SIMULATOR)

     

       968
       968
       +
       +      elseif(sdk STREQUAL "TVOS" OR sdk STREQUAL "TVOS_SIMULATOR")

     

       969
       969
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       970
       970
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_TVOS})

     

       971
       971
       +
       -      elseif(${sdk} STREQUAL WATCHOS OR ${sdk} STREQUAL WATCHOS_SIMULATOR)

     

       972
       972
       +
       +      elseif(sdk STREQUAL "WATCHOS" OR sdk STREQUAL "WATCHOS_SIMULATOR")

     

       973
       973
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       974
       974
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_WATCHOS})

     

       975
       975
       +
       -      elseif(${sdk} STREQUAL LINUX)

     

       976
       976
       +
       +      elseif(sdk STREQUAL "LINUX")

     

       977
       977
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       978
       978
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_LINUX})

     

       979
       979
       +
       -      elseif(${sdk} STREQUAL WINDOWS)

     

       980
       980
       +
       +      elseif(sdk STREQUAL "WINDOWS")

     

       981
       981
       +
                list(APPEND swiftlib_c_compile_flags_all

     

       982
       982
       +
                     ${SWIFTLIB_C_COMPILE_FLAGS_WINDOWS})

     

       983
       983
       +
              endif()

     

       984
       984
       +
       @@ -2124,7 +2124,7 @@ function(add_swift_target_library name)

     

       985
       985
       +
              endif()

     

       986
       986
       +
        

     

       987
       987
       +
              # Setting back linker flags which are not supported when making Android build on macOS cross-compile host.

     

       988
       988
       +
       -      if(SWIFTLIB_SHARED AND ${sdk} STREQUAL ANDROID)

     

       989
       989
       +
       +      if(SWIFTLIB_SHARED AND sdk STREQUAL "ANDROID")

     

       990
       990
       +
                list(APPEND swiftlib_link_flags_all "-shared")

     

       991
       991
       +
                # TODO: Instead of `lib${name}.so` find variable or target property which already have this value.

     

       992
       992
       +
                list(APPEND swiftlib_link_flags_all "-Wl,-soname,lib${name}.so")

     

       993
       993
       +
       @@ -2181,7 +2181,7 @@ function(add_swift_target_library name)

     

       994
       994
       +
              add_dependencies(${VARIANT_NAME} clang)

     

       995
       995
       +
            endif()

     

       996
       996
       +
        

     

       997
       997
       +
       -      if(sdk STREQUAL WINDOWS)

     

       998
       998
       +
       +      if(sdk STREQUAL "WINDOWS")

     

       999
       999
       +
                if(SWIFT_COMPILER_IS_MSVC_LIKE)

     

       1000
       1000
       +
                  if (SWIFT_STDLIB_MSVC_RUNTIME_LIBRARY MATCHES MultiThreadedDebugDLL)

     

       1001
       1001
       +
                    target_compile_options(${VARIANT_NAME} PRIVATE /MDd /D_DLL /D_DEBUG)

     

       1002
       1002
       +
       @@ -2326,7 +2326,7 @@ function(add_swift_target_library name)

     

       1003
       1003
       +
                set(optional_arg "OPTIONAL")

     

       1004
       1004
       +
              endif()

     

       1005
       1005
       +
        

     

       1006
       1006
       +
       -      if(sdk STREQUAL WINDOWS AND CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       1007
       1007
       +
       +      if(sdk STREQUAL "WINDOWS" AND CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       1008
       1008
       +
                add_dependencies(${SWIFTLIB_INSTALL_IN_COMPONENT} ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH})

     

       1009
       1009
       +
                swift_install_in_component(TARGETS ${name}-windows-${SWIFT_PRIMARY_VARIANT_ARCH}

     

       1010
       1010
       +
                                           RUNTIME

     

       1011
       1011
       +
       @@ -2357,7 +2357,7 @@ function(add_swift_target_library name)

     

       1012
       1012
       +
                                           PERMISSIONS ${file_permissions}

     

       1013
       1013
       +
                                           "${optional_arg}")

     

       1014
       1014
       +
              endif()

     

       1015
       1015
       +
       -      if(sdk STREQUAL WINDOWS)

     

       1016
       1016
       +
       +      if(sdk STREQUAL "WINDOWS")

     

       1017
       1017
       +
                foreach(arch ${SWIFT_SDK_WINDOWS_ARCHITECTURES})

     

       1018
       1018
       +
                  if(TARGET ${name}-windows-${arch}_IMPLIB)

     

       1019
       1019
       +
                    get_target_property(import_library ${name}-windows-${arch}_IMPLIB IMPORTED_LOCATION)

     

       1020
       1020
       +
       @@ -2558,13 +2558,13 @@ function(_add_swift_target_executable_single name)

     

       1021
       1021
       +
                ${SWIFTEXE_SINGLE_DEPENDS})

     

       1022
       1022
       +
          llvm_update_compile_flags("${name}")

     

       1023
       1023
       +
        

     

       1024
       1024
       +
       -  if(SWIFTEXE_SINGLE_SDK STREQUAL WINDOWS)

     

       1025
       1025
       +
       +  if(SWIFTEXE_SINGLE_SDK STREQUAL "WINDOWS")

     

       1026
       1026
       +
            swift_windows_include_for_arch(${SWIFTEXE_SINGLE_ARCHITECTURE}

     

       1027
       1027
       +
              ${SWIFTEXE_SINGLE_ARCHITECTURE}_INCLUDE)

     

       1028
       1028
       +
            target_include_directories(${name} SYSTEM PRIVATE

     

       1029
       1029
       +
              ${${SWIFTEXE_SINGLE_ARCHITECTURE}_INCLUDE})

     

       1030
       1030
       +
        

     

       1031
       1031
       +
       -    if(NOT ${CMAKE_C_COMPILER_ID} STREQUAL MSVC)

     

       1032
       1032
       +
       +    if(NOT CMAKE_C_COMPILER_ID STREQUAL "MSVC")

     

       1033
       1033
       +
              # MSVC doesn't support -Xclang. We don't need to manually specify

     

       1034
       1034
       +
              # the dependent libraries as `cl` does so.

     

       1035
       1035
       +
              target_compile_options(${name} PRIVATE

     

       1036
       1036
       +
       @@ -2584,7 +2584,7 @@ function(_add_swift_target_executable_single name)

     

       1037
       1037
       +
          if (SWIFT_PARALLEL_LINK_JOBS)

     

       1038
       1038
       +
            set_property(TARGET ${name} PROPERTY JOB_POOL_LINK swift_link_job_pool)

     

       1039
       1039
       +
          endif()

     

       1040
       1040
       +
       -  if(${SWIFTEXE_SINGLE_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1041
       1041
       +
       +  if(SWIFTEXE_SINGLE_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1042
       1042
       +
            set_target_properties(${name} PROPERTIES

     

       1043
       1043
       +
              BUILD_WITH_INSTALL_RPATH YES

     

       1044
       1044
       +
              INSTALL_RPATH "@executable_path/../lib/swift/${SWIFT_SDK_${SWIFTEXE_SINGLE_SDK}_LIB_SUBDIR}")

     

       1045
       1045
       +
       @@ -2596,7 +2596,7 @@ function(_add_swift_target_executable_single name)

     

       1046
       1046
       +
          # NOTE(compnerd) use the C linker language to invoke `clang` rather than

     

       1047
       1047
       +
          # `clang++` as we explicitly link against the C++ runtime.  We were previously

     

       1048
       1048
       +
          # actually passing `-nostdlib++` to avoid the C++ runtime linkage.

     

       1049
       1049
       +
       -  if(${SWIFTEXE_SINGLE_SDK} STREQUAL ANDROID)

     

       1050
       1050
       +
       +  if(SWIFTEXE_SINGLE_SDK STREQUAL "ANDROID")

     

       1051
       1051
       +
            set_property(TARGET "${name}" PROPERTY

     

       1052
       1052
       +
              LINKER_LANGUAGE "C")

     

       1053
       1053
       +
          else()

     

       1054
       1054
       +
       @@ -2666,7 +2666,7 @@ function(add_swift_target_executable name)

     

       1055
       1055
       +
                  EXCLUDE_FROM_ALL TRUE)

     

       1056
       1056
       +
              endif()

     

       1057
       1057
       +
        

     

       1058
       1058
       +
       -      if(${sdk} IN_LIST SWIFT_APPLE_PLATFORMS)

     

       1059
       1059
       +
       +      if(sdk IN_LIST SWIFT_APPLE_PLATFORMS)

     

       1060
       1060
       +
                # In the past, we relied on unsetting globally

     

       1061
       1061
       +
                # CMAKE_OSX_ARCHITECTURES to ensure that CMake would

     

       1062
       1062
       +
                # not add the -arch flag

     

       1063
       1063
       +
       diff --git a/stdlib/cmake/modules/SwiftSource.cmake b/stdlib/cmake/modules/SwiftSource.cmake

     

       1064
       1064
       +
       index d5d57dfd18a..39c2e07860f 100644

     

       1065
       1065
       +
       --- a/stdlib/cmake/modules/SwiftSource.cmake

     

       1066
       1066
       +
       +++ b/stdlib/cmake/modules/SwiftSource.cmake

     

       1067
       1067
       +
       @@ -730,7 +730,7 @@ function(_compile_swift_files

     

       1068
       1068
       +
        

     

       1069
       1069
       +
          set(line_directive_tool "${SWIFT_SOURCE_DIR}/utils/line-directive")

     

       1070
       1070
       +
        

     

       1071
       1071
       +
       -  if(CMAKE_HOST_SYSTEM_NAME STREQUAL Windows)

     

       1072
       1072
       +
       +  if(CMAKE_HOST_SYSTEM_NAME STREQUAL "Windows")

     

       1073
       1073
       +
            set(HOST_EXECUTABLE_SUFFIX .exe)

     

       1074
       1074
       +
          endif()

     

       1075
       1075
       +
          if(SWIFT_BUILD_RUNTIME_WITH_HOST_COMPILER)

     

       1076
       1076
       +
       @@ -748,7 +748,7 @@ function(_compile_swift_files

     

       1077
       1077
       +
                "${SWIFT_NATIVE_SWIFT_TOOLS_PATH}/swiftc${HOST_EXECUTABLE_SUFFIX}"

     

       1078
       1078
       +
                "${SWIFTFILE_BOOTSTRAPPING}")

     

       1079
       1079
       +
        

     

       1080
       1080
       +
       -    if(NOT ${SWIFTFILE_BOOTSTRAPPING} STREQUAL "")

     

       1081
       1081
       +
       +    if(NOT "${SWIFTFILE_BOOTSTRAPPING}" STREQUAL "")

     

       1082
       1082
       +
              set(target_suffix "-bootstrapping${SWIFTFILE_BOOTSTRAPPING}")

     

       1083
       1083
       +
            endif()

     

       1084
       1084
       +
        

     

       1085
       1085
       +
       @@ -786,7 +786,7 @@ function(_compile_swift_files

     

       1086
       1086
       +
              # When building the stdlib with bootstrapping, the compiler needs

     

       1087
       1087
       +
              # to pick up the stdlib from the previous bootstrapping stage, because the

     

       1088
       1088
       +
              # stdlib in the current stage is not built yet.

     

       1089
       1089
       +
       -      if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_APPLE_PLATFORMS)

     

       1090
       1090
       +
       +      if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_APPLE_PLATFORMS)

     

       1091
       1091
       +
                set(set_environment_args "${CMAKE_COMMAND}" "-E" "env" "DYLD_LIBRARY_PATH=${bs_lib_dir}")

     

       1092
       1092
       +
              elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD|FREEBSD")

     

       1093
       1093
       +
                set(set_environment_args "${CMAKE_COMMAND}" "-E" "env" "LD_LIBRARY_PATH=${bs_lib_dir}")

     

       1094
       1094
       +
       diff --git a/stdlib/public/Concurrency/CMakeLists.txt b/stdlib/public/Concurrency/CMakeLists.txt

     

       1095
       1095
       +
       index ff614adce76..76e0694a731 100644

     

       1096
       1096
       +
       --- a/stdlib/public/Concurrency/CMakeLists.txt

     

       1097
       1097
       +
       +++ b/stdlib/public/Concurrency/CMakeLists.txt

     

       1098
       1098
       +
       @@ -26,14 +26,14 @@ set(SWIFT_RUNTIME_CONCURRENCY_C_FLAGS)

     

       1099
       1099
       +
        set(SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS)

     

       1100
       1100
       +
        

     

       1101
       1101
       +
        set(swift_concurrency_private_link_libraries)

     

       1102
       1102
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       1103
       1103
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       1104
       1104
       +
          list(APPEND swift_concurrency_private_link_libraries Synchronization)

     

       1105
       1105
       +
        endif()

     

       1106
       1106
       +
        

     

       1107
       1107
       +
        set(swift_concurrency_incorporate_object_libraries_so swiftThreading)

     

       1108
       1108
       +
        

     

       1109
       1109
       +
        if("${SWIFT_CONCURRENCY_GLOBAL_EXECUTOR}" STREQUAL "dispatch")

     

       1110
       1110
       +
       -  if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1111
       1111
       +
       +  if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1112
       1112
       +
            include_directories(AFTER

     

       1113
       1113
       +
                                  ${SWIFT_PATH_TO_LIBDISPATCH_SOURCE})

     

       1114
       1114
       +
        

     

       1115
       1115
       +
       @@ -61,7 +61,7 @@ endif()

     

       1116
       1116
       +
        

     

       1117
       1117
       +
        # Don't emit extended frame info on platforms other than darwin, system

     

       1118
       1118
       +
        # backtracer and system debugger are unlikely to support it.

     

       1119
       1119
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1120
       1120
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1121
       1121
       +
          list(APPEND SWIFT_RUNTIME_CONCURRENCY_C_FLAGS

     

       1122
       1122
       +
            "-fswift-async-fp=${swift_concurrency_async_fp_mode}")

     

       1123
       1123
       +
          list(APPEND SWIFT_RUNTIME_CONCURRENCY_SWIFT_FLAGS

     

       1124
       1124
       +
       diff --git a/stdlib/public/Cxx/std/CMakeLists.txt b/stdlib/public/Cxx/std/CMakeLists.txt

     

       1125
       1125
       +
       index f24d08b6b62..b805b2ed6cb 100644

     

       1126
       1126
       +
       --- a/stdlib/public/Cxx/std/CMakeLists.txt

     

       1127
       1127
       +
       +++ b/stdlib/public/Cxx/std/CMakeLists.txt

     

       1128
       1128
       +
       @@ -1,6 +1,6 @@

     

       1129
       1129
       +
        set(libstdcxx_modulemap_target_list)

     

       1130
       1130
       +
        foreach(sdk ${SWIFT_SDKS})

     

       1131
       1131
       +
       -  if(NOT ${sdk} IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)

     

       1132
       1132
       +
       +  if(NOT sdk IN_LIST SWIFT_LIBSTDCXX_PLATFORMS)

     

       1133
       1133
       +
            continue()

     

       1134
       1134
       +
          endif()

     

       1135
       1135
       +
        

     

       1136
       1136
       +
       @@ -86,7 +86,7 @@ foreach(sdk ${SWIFT_SDKS})

     

       1137
       1137
       +
                  COMPONENT sdk-overlay)

     

       1138
       1138
       +
            endif()

     

       1139
       1139
       +
        

     

       1140
       1140
       +
       -    if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       1141
       1141
       +
       +    if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1142
       1142
       +
              foreach(bootstrapping "0" "1")

     

       1143
       1143
       +
                get_bootstrapping_path(bootstrapping_dir ${module_dir} ${bootstrapping})

     

       1144
       1144
       +
                set(libstdcxx_modulemap_out_bootstrapping "${bootstrapping_dir}/libstdcxx.modulemap")

     

       1145
       1145
       +
       diff --git a/stdlib/public/Platform/CMakeLists.txt b/stdlib/public/Platform/CMakeLists.txt

     

       1146
       1146
       +
       index 9063931bd20..757a89eb760 100644

     

       1147
       1147
       +
       --- a/stdlib/public/Platform/CMakeLists.txt

     

       1148
       1148
       +
       +++ b/stdlib/public/Platform/CMakeLists.txt

     

       1149
       1149
       +
       @@ -42,8 +42,8 @@ set(swiftDarwin_common_options

     

       1150
       1150
       +
              DEPENDS ${darwin_depends})

     

       1151
       1151
       +
        

     

       1152
       1152
       +
        

     

       1153
       1153
       +
       -if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING" AND

     

       1154
       1154
       +
       -   ${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1155
       1155
       +
       +if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING" AND

     

       1156
       1156
       +
       +   SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1157
       1157
       +
        

     

       1158
       1158
       +
          set(swiftDarwin_common_bootstrapping_options

     

       1159
       1159
       +
              ${swiftDarwin_common_options}

     

       1160
       1160
       +
       @@ -179,7 +179,7 @@ foreach(sdk ${SWIFT_SDKS})

     

       1161
       1161
       +
            # with its own native sysroot, create a native modulemap without a sysroot

     

       1162
       1162
       +
            # prefix. This is the one we'll install instead.

     

       1163
       1163
       +
            if(NOT "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${arch}_PATH}" STREQUAL "/" AND

     

       1164
       1164
       +
       -       NOT (${sdk} STREQUAL ANDROID AND NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL ""))

     

       1165
       1165
       +
       +       NOT (sdk STREQUAL "ANDROID" AND NOT "${SWIFT_ANDROID_NATIVE_SYSROOT}" STREQUAL ""))

     

       1166
       1166
       +
              set(glibc_sysroot_relative_modulemap_out "${module_dir}/sysroot-relative-modulemaps/glibc.modulemap")

     

       1167
       1167
       +
        

     

       1168
       1168
       +
              handle_gyb_source_single(glibc_modulemap_native_target

     

       1169
       1169
       +
       diff --git a/stdlib/public/SwiftOnoneSupport/CMakeLists.txt b/stdlib/public/SwiftOnoneSupport/CMakeLists.txt

     

       1170
       1170
       +
       index 50efa52b7e1..cf6f09bcf69 100644

     

       1171
       1171
       +
       --- a/stdlib/public/SwiftOnoneSupport/CMakeLists.txt

     

       1172
       1172
       +
       +++ b/stdlib/public/SwiftOnoneSupport/CMakeLists.txt

     

       1173
       1173
       +
       @@ -10,7 +10,7 @@ set(swiftOnoneSupport_common_options

     

       1174
       1174
       +
          SWIFT_COMPILE_FLAGS "-parse-stdlib" "-Xllvm" "-sil-inline-generics=false" "-Xfrontend" "-validate-tbd-against-ir=none" "-Xfrontend" "-check-onone-completeness" "-Xfrontend" "-disable-access-control" "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}" "${SWIFT_STANDARD_LIBRARY_SWIFT_FLAGS}"

     

       1175
       1175
       +
          LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}")

     

       1176
       1176
       +
        

     

       1177
       1177
       +
       -if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND ${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING")

     

       1178
       1178
       +
       +if(CMAKE_BUILD_TYPE STREQUAL "Debug" AND BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")

     

       1179
       1179
       +
        

     

       1180
       1180
       +
          set(swiftOnoneSupport_common_bootstrapping_options

     

       1181
       1181
       +
            SHARED

     

       1182
       1182
       +
       diff --git a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

     

       1183
       1183
       +
       index c54b2cf84b2..f925940d8a2 100644

     

       1184
       1184
       +
       --- a/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

     

       1185
       1185
       +
       +++ b/stdlib/public/SwiftShims/swift/shims/CMakeLists.txt

     

       1186
       1186
       +
       @@ -152,7 +152,7 @@ if(NOT SWIFT_BUILT_STANDALONE)

     

       1187
       1187
       +
          endforeach()

     

       1188
       1188
       +
        endif()

     

       1189
       1189
       +
        

     

       1190
       1190
       +
       -if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       1191
       1191
       +
       +if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1192
       1192
       +
          foreach(bootstrapping "0" "1")

     

       1193
       1193
       +
            get_bootstrapping_path(outdir ${SWIFTLIB_DIR} ${bootstrapping})

     

       1194
       1194
       +
            set(target_name "symlink-headers-bootstrapping${bootstrapping}")

     

       1195
       1195
       +
       diff --git a/stdlib/public/core/CMakeLists.txt b/stdlib/public/core/CMakeLists.txt

     

       1196
       1196
       +
       index c2217c9f294..be0d826b29d 100644

     

       1197
       1197
       +
       --- a/stdlib/public/core/CMakeLists.txt

     

       1198
       1198
       +
       +++ b/stdlib/public/core/CMakeLists.txt

     

       1199
       1199
       +
       @@ -251,18 +251,18 @@ set(swift_core_framework_depends)

     

       1200
       1200
       +
        set(swift_core_private_link_libraries)

     

       1201
       1201
       +
        set(swift_stdlib_compile_flags "${SWIFT_RUNTIME_SWIFT_COMPILE_FLAGS}")

     

       1202
       1202
       +
        

     

       1203
       1203
       +
       -if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL CYGWIN)

     

       1204
       1204
       +
       +if(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "CYGWIN")

     

       1205
       1205
       +
          # TODO(compnerd) cache this variable to permit re-configuration

     

       1206
       1206
       +
          execute_process(COMMAND "cygpath" "-u" "$ENV{SYSTEMROOT}" OUTPUT_VARIABLE ENV_SYSTEMROOT)

     

       1207
       1207
       +
          list(APPEND swift_core_private_link_libraries "${ENV_SYSTEMROOT}/system32/psapi.dll")

     

       1208
       1208
       +
       -elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL FREEBSD)

     

       1209
       1209
       +
       +elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "FREEBSD")

     

       1210
       1210
       +
          find_library(EXECINFO_LIBRARY execinfo)

     

       1211
       1211
       +
          list(APPEND swift_core_private_link_libraries ${EXECINFO_LIBRARY})

     

       1212
       1212
       +
       -elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL LINUX)

     

       1213
       1213
       +
       +elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "LINUX")

     

       1214
       1214
       +
          if(SWIFT_BUILD_STATIC_STDLIB)

     

       1215
       1215
       +
            list(APPEND swift_core_private_link_libraries)

     

       1216
       1216
       +
          endif()

     

       1217
       1217
       +
       -elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL WINDOWS)

     

       1218
       1218
       +
       +elseif(SWIFT_PRIMARY_VARIANT_SDK STREQUAL "WINDOWS")

     

       1219
       1219
       +
          list(APPEND swift_core_private_link_libraries shell32;DbgHelp;Synchronization)

     

       1220
       1220
       +
        endif()

     

       1221
       1221
       +
        

     

       1222
       1222
       +
       @@ -331,7 +331,7 @@ set(swiftCore_common_options

     

       1223
       1223
       +
        set(swiftCore_common_dependencies

     

       1224
       1224
       +
            copy_shim_headers "${SWIFTLIB_DIR}/shims" ${GROUP_INFO_JSON_FILE})

     

       1225
       1225
       +
        

     

       1226
       1226
       +
       -if(${BOOTSTRAPPING_MODE} STREQUAL "BOOTSTRAPPING")

     

       1227
       1227
       +
       +if(BOOTSTRAPPING_MODE STREQUAL "BOOTSTRAPPING")

     

       1228
       1228
       +
        

     

       1229
       1229
       +
          set(b0_deps symlink-headers-bootstrapping0)

     

       1230
       1230
       +
          set(b1_deps symlink-headers-bootstrapping1)

     

       1231
       1231
       +
       diff --git a/stdlib/public/runtime/CMakeLists.txt b/stdlib/public/runtime/CMakeLists.txt

     

       1232
       1232
       +
       index e46c37d626b..db503543b6b 100644

     

       1233
       1233
       +
       --- a/stdlib/public/runtime/CMakeLists.txt

     

       1234
       1234
       +
       +++ b/stdlib/public/runtime/CMakeLists.txt

     

       1235
       1235
       +
       @@ -163,7 +163,7 @@ foreach(sdk ${SWIFT_SDKS})

     

       1236
       1236
       +
              # set(swiftrtObject "$<TARGET_OBJECTS:swiftImageRegistrationObject${SWIFT_SDK_${sdk}_OBJECT_FORMAT}-${arch_suffix}>")

     

       1237
       1237
       +
              set(swiftrtObject ${CMAKE_CURRENT_BINARY_DIR}/CMakeFiles/swiftImageRegistrationObject${SWIFT_SDK_${sdk}_OBJECT_FORMAT}-${arch_suffix}.dir/SwiftRT-${SWIFT_SDK_${sdk}_OBJECT_FORMAT}.cpp${CMAKE_C_OUTPUT_EXTENSION})

     

       1238
       1238
       +
        

     

       1239
       1239
       +
       -      if(sdk STREQUAL WINDOWS)

     

       1240
       1240
       +
       +      if(sdk STREQUAL "WINDOWS")

     

       1241
       1241
       +
                set(extension .obj)

     

       1242
       1242
       +
              else()

     

       1243
       1243
       +
                set(extension .o)

     

       1244
       1244
       +
       @@ -209,12 +209,12 @@ foreach(sdk ${SWIFT_SDKS})

     

       1245
       1245
       +
        

     

       1246
       1246
       +
            # Generate the static-stdlib-args.lnk file used by -static-stdlib option for

     

       1247
       1247
       +
            # 'GenericUnix' (eg linux)

     

       1248
       1248
       +
       -    if(${SWIFT_SDK_${sdk}_OBJECT_FORMAT} STREQUAL ELF)

     

       1249
       1249
       +
       +    if(SWIFT_SDK_${sdk}_OBJECT_FORMAT STREQUAL "ELF")

     

       1250
       1250
       +
              string(TOLOWER "${sdk}" lowercase_sdk)

     

       1251
       1251
       +
              set(libpthread -lpthread)

     

       1252
       1252
       +
              set(concurrency_libs)

     

       1253
       1253
       +
              set(android_libraries)

     

       1254
       1254
       +
       -      if(${sdk} STREQUAL ANDROID)

     

       1255
       1255
       +
       +      if(sdk STREQUAL "ANDROID")

     

       1256
       1256
       +
                set(android_libraries -llog)

     

       1257
       1257
       +
                set(libpthread)

     

       1258
       1258
       +
              elseif(SWIFT_CONCURRENCY_USES_DISPATCH)

     

       1259
       1259
       +
       diff --git a/stdlib/toolchain/legacy_layouts/CMakeLists.txt b/stdlib/toolchain/legacy_layouts/CMakeLists.txt

     

       1260
       1260
       +
       index ad18c6b1b32..96da3906821 100644

     

       1261
       1261
       +
       --- a/stdlib/toolchain/legacy_layouts/CMakeLists.txt

     

       1262
       1262
       +
       +++ b/stdlib/toolchain/legacy_layouts/CMakeLists.txt

     

       1263
       1263
       +
       @@ -55,7 +55,7 @@ foreach(sdk ${SWIFT_SDKS})

     

       1264
       1264
       +
          endforeach()

     

       1265
       1265
       +
        endforeach()

     

       1266
       1266
       +
        

     

       1267
       1267
       +
       -if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       1268
       1268
       +
       +if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1269
       1269
       +
          # The resource dir for bootstrapping0 may be used explicitly

     

       1270
       1270
       +
          # to cross compile for other architectures, so we would need

     

       1271
       1271
       +
          # to have all the legacy layouts in there

     

       1272
       1272
       +
       diff --git a/tools/SourceKit/CMakeLists.txt b/tools/SourceKit/CMakeLists.txt

     

       1273
       1273
       +
       index f87720f9c80..6c0c0800bc4 100644

     

       1274
       1274
       +
       --- a/tools/SourceKit/CMakeLists.txt

     

       1275
       1275
       +
       +++ b/tools/SourceKit/CMakeLists.txt

     

       1276
       1276
       +
       @@ -82,7 +82,7 @@ if("${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")

     

       1277
       1277
       +
          # Add deployment target to C/C++ compiler and linker flags.

     

       1278
       1278
       +
          # FIXME: CMAKE_OSX_DEPLOYMENT_TARGET falls over when used for iOS versions.

     

       1279
       1279
       +
          if (XCODE)

     

       1280
       1280
       +
       -    if (${SOURCEKIT_DEPLOYMENT_OS} MATCHES "^macosx")

     

       1281
       1281
       +
       +    if (SOURCEKIT_DEPLOYMENT_OS MATCHES "^macosx")

     

       1282
       1282
       +
              set(CMAKE_XCODE_ATTRIBUTE_MACOSX_DEPLOYMENT_TARGET ${SOURCEKIT_DEPLOYMENT_TARGET})

     

       1283
       1283
       +
            else()

     

       1284
       1284
       +
              set(CMAKE_XCODE_ATTRIBUTE_IPHONEOS_DEPLOYMENT_TARGET ${SOURCEKIT_DEPLOYMENT_TARGET})

     

       1285
       1285
       +
       @@ -101,7 +101,7 @@ if(NOT "${CMAKE_SYSTEM_NAME}" STREQUAL "Darwin")

     

       1286
       1286
       +
        endif()

     

       1287
       1287
       +
        

     

       1288
       1288
       +
        if(SWIFT_BUILD_HOST_DISPATCH)

     

       1289
       1289
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       1290
       1290
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       1291
       1291
       +
            set(SOURCEKIT_RUNTIME_DIR bin)

     

       1292
       1292
       +
          else()

     

       1293
       1293
       +
            set(SOURCEKIT_RUNTIME_DIR lib)

     

       1294
       1294
       +
       @@ -114,7 +114,7 @@ if(SWIFT_BUILD_HOST_DISPATCH)

     

       1295
       1295
       +
              DESTINATION ${SOURCEKIT_RUNTIME_DIR}

     

       1296
       1296
       +
              COMPONENT sourcekit-inproc)

     

       1297
       1297
       +
          endif()

     

       1298
       1298
       +
       -  if(SWIFT_HOST_VARIANT_SDK STREQUAL WINDOWS)

     

       1299
       1299
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       1300
       1300
       +
            swift_install_in_component(FILES

     

       1301
       1301
       +
              $<TARGET_LINKER_FILE:dispatch>

     

       1302
       1302
       +
              $<TARGET_LINKER_FILE:BlocksRuntime>

     

       1303
       1303
       +
       diff --git a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

     

       1304
       1304
       +
       index 14d9a99a13a..bc26b263848 100644

     

       1305
       1305
       +
       --- a/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

     

       1306
       1306
       +
       +++ b/tools/SourceKit/cmake/modules/AddSwiftSourceKit.cmake

     

       1307
       1307
       +
       @@ -8,7 +8,7 @@ function(add_sourcekit_default_compiler_flags target)

     

       1308
       1308
       +
          _add_host_variant_link_flags(${target})

     

       1309
       1309
       +
        

     

       1310
       1310
       +
          # Set compilation and link flags.

     

       1311
       1311
       +
       -  if(${SWIFT_HOST_VARIANT_SDK} STREQUAL WINDOWS)

     

       1312
       1312
       +
       +  if(SWIFT_HOST_VARIANT_SDK STREQUAL "WINDOWS")

     

       1313
       1313
       +
            swift_windows_include_for_arch(${SWIFT_HOST_VARIANT_ARCH}

     

       1314
       1314
       +
              ${SWIFT_HOST_VARIANT_ARCH}_INCLUDE)

     

       1315
       1315
       +
            target_include_directories(${target} SYSTEM PRIVATE

     

       1316
       1316
       +
       @@ -30,7 +30,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)

     

       1317
       1317
       +
            endif()

     

       1318
       1318
       +
          endif()

     

       1319
       1319
       +
        

     

       1320
       1320
       +
       -  if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1321
       1321
       +
       +  if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1322
       1322
       +
        

     

       1323
       1323
       +
            # Lists of rpaths that we are going to add to our executables.

     

       1324
       1324
       +
            #

     

       1325
       1325
       +
       @@ -118,7 +118,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)

     

       1326
       1326
       +
        

     

       1327
       1327
       +
          elseif(SWIFT_HOST_VARIANT_SDK MATCHES "LINUX|ANDROID|OPENBSD" AND HAS_SWIFT_MODULES AND ASKD_BOOTSTRAPPING_MODE)

     

       1328
       1328
       +
            set(swiftrt "swiftImageRegistrationObject${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_OBJECT_FORMAT}-${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_LIB_SUBDIR}-${SWIFT_HOST_VARIANT_ARCH}")

     

       1329
       1329
       +
       -    if(${ASKD_BOOTSTRAPPING_MODE} MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       1330
       1330
       +
       +    if(ASKD_BOOTSTRAPPING_MODE MATCHES "HOSTTOOLS|CROSSCOMPILE")

     

       1331
       1331
       +
              # At build time and run time, link against the swift libraries in the

     

       1332
       1332
       +
              # installed host toolchain.

     

       1333
       1333
       +
              get_filename_component(swift_bin_dir ${SWIFT_EXEC_FOR_SWIFT_MODULES} DIRECTORY)

     

       1334
       1334
       +
       @@ -163,7 +163,7 @@ function(add_sourcekit_swift_runtime_link_flags target path HAS_SWIFT_MODULES)

     

       1335
       1335
       +
            # able to fall back to the SDK directory for libswiftCore et al.

     

       1336
       1336
       +
            if (BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1337
       1337
       +
              if (NOT "${bootstrapping}" STREQUAL "1")

     

       1338
       1338
       +
       -        if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1339
       1339
       +
       +        if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1340
       1340
       +
                  target_link_directories(${target} PRIVATE "${sdk_dir}")

     

       1341
       1341
       +
        

     

       1342
       1342
       +
                  # Include the abi stable system stdlib in our rpath.

     

       1343
       1343
       +
       diff --git a/tools/SourceKit/lib/Support/CMakeLists.txt b/tools/SourceKit/lib/Support/CMakeLists.txt

     

       1344
       1344
       +
       index c4e2cbcd31e..a47b2347a12 100644

     

       1345
       1345
       +
       --- a/tools/SourceKit/lib/Support/CMakeLists.txt

     

       1346
       1346
       +
       +++ b/tools/SourceKit/lib/Support/CMakeLists.txt

     

       1347
       1347
       +
       @@ -9,7 +9,7 @@ target_link_libraries(SourceKitSupport PRIVATE

     

       1348
       1348
       +
          swiftBasic

     

       1349
       1349
       +
          clangBasic

     

       1350
       1350
       +
          clangRewrite)

     

       1351
       1351
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1352
       1352
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1353
       1353
       +
          target_link_libraries(SourceKitSupport INTERFACE

     

       1354
       1354
       +
            dispatch

     

       1355
       1355
       +
            BlocksRuntime)

     

       1356
       1356
       +
       diff --git a/tools/SourceKit/tools/complete-test/CMakeLists.txt b/tools/SourceKit/tools/complete-test/CMakeLists.txt

     

       1357
       1357
       +
       index ec3437650a0..d1b3fe3b36a 100644

     

       1358
       1358
       +
       --- a/tools/SourceKit/tools/complete-test/CMakeLists.txt

     

       1359
       1359
       +
       +++ b/tools/SourceKit/tools/complete-test/CMakeLists.txt

     

       1360
       1360
       +
       @@ -7,13 +7,13 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)

     

       1361
       1361
       +
        else()

     

       1362
       1362
       +
          target_link_libraries(complete-test PRIVATE sourcekitd)

     

       1363
       1363
       +
        endif()

     

       1364
       1364
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1365
       1365
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1366
       1366
       +
          target_link_libraries(complete-test PRIVATE

     

       1367
       1367
       +
            dispatch

     

       1368
       1368
       +
            BlocksRuntime)

     

       1369
       1369
       +
        endif()

     

       1370
       1370
       +
        

     

       1371
       1371
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1372
       1372
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1373
       1373
       +
          set_target_properties(complete-test PROPERTIES

     

       1374
       1374
       +
            INSTALL_RPATH "@executable_path/../lib")

     

       1375
       1375
       +
          target_link_options(complete-test PRIVATE

     

       1376
       1376
       +
       diff --git a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

     

       1377
       1377
       +
       index d4a3a77df2a..f537ad74544 100644

     

       1378
       1378
       +
       --- a/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

     

       1379
       1379
       +
       +++ b/tools/SourceKit/tools/sourcekitd-repl/CMakeLists.txt

     

       1380
       1380
       +
       @@ -7,7 +7,7 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)

     

       1381
       1381
       +
        else()

     

       1382
       1382
       +
          target_link_libraries(sourcekitd-repl PRIVATE sourcekitd)

     

       1383
       1383
       +
        endif()

     

       1384
       1384
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1385
       1385
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1386
       1386
       +
          target_link_libraries(sourcekitd-repl PRIVATE

     

       1387
       1387
       +
            dispatch

     

       1388
       1388
       +
            BlocksRuntime)

     

       1389
       1389
       +
       @@ -15,7 +15,7 @@ endif()

     

       1390
       1390
       +
        target_link_libraries(sourcekitd-repl PRIVATE

     

       1391
       1391
       +
          libedit)

     

       1392
       1392
       +
        

     

       1393
       1393
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1394
       1394
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1395
       1395
       +
          set_target_properties(sourcekitd-repl PROPERTIES

     

       1396
       1396
       +
            INSTALL_RPATH "@executable_path/../lib")

     

       1397
       1397
       +
          target_link_options(sourcekitd-repl PRIVATE

     

       1398
       1398
       +
       diff --git a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

     

       1399
       1399
       +
       index 91c28f371c4..e5f7aa5c9fb 100644

     

       1400
       1400
       +
       --- a/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

     

       1401
       1401
       +
       +++ b/tools/SourceKit/tools/sourcekitd-test/CMakeLists.txt

     

       1402
       1402
       +
       @@ -17,7 +17,7 @@ if(SWIFT_SOURCEKIT_USE_INPROC_LIBRARY)

     

       1403
       1403
       +
        else()

     

       1404
       1404
       +
          target_link_libraries(sourcekitd-test PRIVATE sourcekitd)

     

       1405
       1405
       +
        endif()

     

       1406
       1406
       +
       -if(NOT CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1407
       1407
       +
       +if(NOT CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1408
       1408
       +
          target_link_libraries(sourcekitd-test PRIVATE

     

       1409
       1409
       +
            dispatch

     

       1410
       1410
       +
            BlocksRuntime)

     

       1411
       1411
       +
       @@ -25,7 +25,7 @@ endif()

     

       1412
       1412
       +
        

     

       1413
       1413
       +
        add_dependencies(sourcekitd-test sourcekitdTestOptionsTableGen)

     

       1414
       1414
       +
        

     

       1415
       1415
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Darwin)

     

       1416
       1416
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Darwin")

     

       1417
       1417
       +
          set_target_properties(sourcekitd-test PROPERTIES

     

       1418
       1418
       +
            INSTALL_RPATH "@executable_path/../lib")

     

       1419
       1419
       +
          target_link_options(sourcekitd-test PRIVATE

     

       1420
       1420
       +
       diff --git a/tools/driver/CMakeLists.txt b/tools/driver/CMakeLists.txt

     

       1421
       1421
       +
       index 4521356ffc6..ab6dad7b273 100644

     

       1422
       1422
       +
       --- a/tools/driver/CMakeLists.txt

     

       1423
       1423
       +
       +++ b/tools/driver/CMakeLists.txt

     

       1424
       1424
       +
       @@ -10,7 +10,7 @@ function(add_swift_parser_link_libraries target)

     

       1425
       1425
       +
          endif()

     

       1426
       1426
       +
        endfunction()

     

       1427
       1427
       +
        

     

       1428
       1428
       +
       -if(${BOOTSTRAPPING_MODE} MATCHES "BOOTSTRAPPING.*")

     

       1429
       1429
       +
       +if(BOOTSTRAPPING_MODE MATCHES "BOOTSTRAPPING.*")

     

       1430
       1430
       +
        

     

       1431
       1431
       +
          # Bootstrapping - level 0

     

       1432
       1432
       +
          # For more information on how bootstrapping works, see docs/SwiftInTheCompiler.md

     

       1433
       1433
       +
       diff --git a/tools/libSwiftScan/CMakeLists.txt b/tools/libSwiftScan/CMakeLists.txt

     

       1434
       1434
       +
       index f11c2a99758..93beb4629b0 100644

     

       1435
       1435
       +
       --- a/tools/libSwiftScan/CMakeLists.txt

     

       1436
       1436
       +
       +++ b/tools/libSwiftScan/CMakeLists.txt

     

       1437
       1437
       +
       @@ -8,7 +8,7 @@ add_swift_host_library(libSwiftScan SHARED

     

       1438
       1438
       +
          libSwiftScan.cpp

     

       1439
       1439
       +
          c-include-check.c)

     

       1440
       1440
       +
        

     

       1441
       1441
       +
       -if(${SWIFT_HOST_VARIANT_SDK} IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1442
       1442
       +
       +if(SWIFT_HOST_VARIANT_SDK IN_LIST SWIFT_DARWIN_PLATFORMS)

     

       1443
       1443
       +
          # Workaround for a linker crash related to autolinking: rdar://77839981

     

       1444
       1444
       +
          set_property(TARGET libSwiftScan APPEND_STRING PROPERTY

     

       1445
       1445
       +
                       LINK_FLAGS " -lobjc ")

     

       1446
       1446
       +
       diff --git a/unittests/Basic/CMakeLists.txt b/unittests/Basic/CMakeLists.txt

     

       1447
       1447
       +
       index 547751e6cac..10b413ce732 100644

     

       1448
       1448
       +
       --- a/unittests/Basic/CMakeLists.txt

     

       1449
       1449
       +
       +++ b/unittests/Basic/CMakeLists.txt

     

       1450
       1450
       +
       @@ -49,6 +49,6 @@ target_link_libraries(SwiftBasicTests

     

       1451
       1451
       +
          LLVMTestingSupport

     

       1452
       1452
       +
          )

     

       1453
       1453
       +
        

     

       1454
       1454
       +
       -if(SWIFT_HOST_VARIANT STREQUAL windows)

     

       1455
       1455
       +
       +if(SWIFT_HOST_VARIANT STREQUAL "windows")

     

       1456
       1456
       +
          target_link_libraries(SwiftBasicTests PRIVATE Synchronization)

     

       1457
       1457
       +
        endif()

     

       1458
       1458
       +
       diff --git a/unittests/Threading/CMakeLists.txt b/unittests/Threading/CMakeLists.txt

     

       1459
       1459
       +
       index 5e0f27c089d..239630d038c 100644

     

       1460
       1460
       +
       --- a/unittests/Threading/CMakeLists.txt

     

       1461
       1461
       +
       +++ b/unittests/Threading/CMakeLists.txt

     

       1462
       1462
       +
       @@ -14,7 +14,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND

     

       1463
       1463
       +
            swiftCore${SWIFT_PRIMARY_VARIANT_SUFFIX}

     

       1464
       1464
       +
            )

     

       1465
       1465
       +
        

     

       1466
       1466
       +
       -  if(SWIFT_HOST_VARIANT STREQUAL windows)

     

       1467
       1467
       +
       +  if(SWIFT_HOST_VARIANT STREQUAL "windows")

     

       1468
       1468
       +
            target_link_libraries(SwiftThreadingTests PRIVATE Synchronization)

     

       1469
       1469
       +
          endif()

     

       1470
       1470
       +
        endif()

     

       1471
       1471
       +
       diff --git a/unittests/runtime/CMakeLists.txt b/unittests/runtime/CMakeLists.txt

     

       1472
       1472
       +
       index 79df463c0ed..cef40263785 100644

     

       1473
       1473
       +
       --- a/unittests/runtime/CMakeLists.txt

     

       1474
       1474
       +
       +++ b/unittests/runtime/CMakeLists.txt

     

       1475
       1475
       +
       @@ -63,7 +63,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND

     

       1476
       1476
       +
            list(APPEND PLATFORM_TARGET_LINK_LIBRARIES

     

       1477
       1477
       +
              ${EXECINFO_LIBRARY}

     

       1478
       1478
       +
              )

     

       1479
       1479
       +
       -  elseif(SWIFT_HOST_VARIANT STREQUAL windows)

     

       1480
       1480
       +
       +  elseif(SWIFT_HOST_VARIANT STREQUAL "windows")

     

       1481
       1481
       +
            list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization)

     

       1482
       1482
       +
          endif()

     

       1483
       1483
       +
        

     

       1484
       1484
       +
       diff --git a/unittests/runtime/LongTests/CMakeLists.txt b/unittests/runtime/LongTests/CMakeLists.txt

     

       1485
       1485
       +
       index 592e532f8cf..37b5e00714e 100644

     

       1486
       1486
       +
       --- a/unittests/runtime/LongTests/CMakeLists.txt

     

       1487
       1487
       +
       +++ b/unittests/runtime/LongTests/CMakeLists.txt

     

       1488
       1488
       +
       @@ -30,7 +30,7 @@ if(("${SWIFT_HOST_VARIANT_SDK}" STREQUAL "${SWIFT_PRIMARY_VARIANT_SDK}") AND

     

       1489
       1489
       +
            list(APPEND PLATFORM_TARGET_LINK_LIBRARIES

     

       1490
       1490
       +
              ${EXECINFO_LIBRARY}

     

       1491
       1491
       +
              )

     

       1492
       1492
       +
       -  elseif(SWIFT_HOST_VARIANT STREQUAL windows)

     

       1493
       1493
       +
       +  elseif(SWIFT_HOST_VARIANT STREQUAL "windows")

     

       1494
       1494
       +
            list(APPEND PLATFORM_TARGET_LINK_LIBRARIES DbgHelp;Synchronization)

     

       1495
       1495
       +
          endif()

     

       1496
       1496
       +
        

     

       1497
       1497
       +
       diff --git a/utils/api_checker/CMakeLists.txt b/utils/api_checker/CMakeLists.txt

     

       1498
       1498
       +
       index e664a73ddd9..fea720f6095 100644

     

       1499
       1499
       +
       --- a/utils/api_checker/CMakeLists.txt

     

       1500
       1500
       +
       +++ b/utils/api_checker/CMakeLists.txt

     

       1501
       1501
       +
       @@ -16,7 +16,7 @@ set(SWIFTLIB_DIR "${CMAKE_BINARY_DIR}/${CMAKE_CFG_INTDIR}/lib/swift")

     

       1502
       1502
       +
        set(dest "${SWIFTLIB_DIR}/${framework}")

     

       1503
       1503
       +
        set(source "${CMAKE_CURRENT_SOURCE_DIR}/${framework}")

     

       1504
       1504
       +
        

     

       1505
       1505
       +
       -if(CMAKE_SYSTEM_NAME STREQUAL Windows)

     

       1506
       1506
       +
       +if(CMAKE_SYSTEM_NAME STREQUAL "Windows")

     

       1507
       1507
       +
            set(CMAKE_SYMLINK_COMMAND copy)

     

       1508
       1508
       +
        else()

     

       1509
       1509
       +
            set(CMAKE_SYMLINK_COMMAND create_symlink)

+63

pkgs/development/compilers/swift/compiler/patches/swift-darwin-libcxx-flags.patch

···

       1
       1
       +
       On Darwin, the SDK is a directory of stubs, and libc++ lives separately. We

     

       2
       2
       +
       need to patch the CMake files in several places to make the build for C++

     

       3
       3
       +
       interop succeed. The required flags can be read from cc-wrapper support files.

     

       4
       4
       +
       

     

       5
       5
       +
       --- a/SwiftCompilerSources/CMakeLists.txt

     

       6
       6
       +
       +++ b/SwiftCompilerSources/CMakeLists.txt

     

       7
       7
       +
       @@ -105,18 +105,11 @@ function(add_swift_compiler_modules_library name)

     

       8
       8
       +
              get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       9
       9
       +
              set(sdk_option ${sdk_option} "-resource-dir" "${swift_exec_bin_dir}/../bootstrapping0/lib/swift")

     

       10
       10
       +
            endif()

     

       11
       11
       +
       -    if(NOT EXISTS "${sdk_path}/usr/include/c++")

     

       12
       12
       +
       -      # Darwin SDKs in Xcode 12 or older do not include libc++, which prevents clang from finding libc++ when invoked

     

       13
       13
       +
       -      # from ClangImporter. This results in build errors. To workaround this, let's explicitly pass the path to libc++

     

       14
       14
       +
       -      # to clang.

     

       15
       15
       +
       -      message(WARNING "Building with an outdated Darwin SDK: libc++ missing from the ${SWIFT_HOST_VARIANT_SDK} SDK. Will use libc++ from the toolchain.")

     

       16
       16
       +
       -      get_filename_component(absolute_libcxx_path "${CMAKE_C_COMPILER}/../../include/c++/v1" REALPATH)

     

       17
       17
       +
       -      if (EXISTS "${absolute_libcxx_path}")

     

       18
       18
       +
       -        set(sdk_option ${sdk_option} "-Xcc" "-isystem" "-Xcc" "${absolute_libcxx_path}")

     

       19
       19
       +
       -      else()

     

       20
       20
       +
       -        message(ERROR "libc++ not found in the toolchain.")

     

       21
       21
       +
       -      endif()

     

       22
       22
       +
       -    endif()

     

       23
       23
       +
       +    file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags)

     

       24
       24
       +
       +    separate_arguments(nix_libcxx_cxxflags)

     

       25
       25
       +
       +    foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags})

     

       26
       26
       +
       +      set(sdk_option ${sdk_option} "-Xcc" "${nix_libcxx_cxxflag}")

     

       27
       27
       +
       +    endforeach()

     

       28
       28
       +
          elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")

     

       29
       29
       +
            set(sdk_option "-sdk" "${SWIFT_SDK_${SWIFT_HOST_VARIANT_SDK}_ARCH_${SWIFT_HOST_VARIANT_ARCH}_PATH}")

     

       30
       30
       +
            get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       31
       31
       +
       --- a/cmake/modules/SwiftConfigureSDK.cmake

     

       32
       32
       +
       +++ b/cmake/modules/SwiftConfigureSDK.cmake

     

       33
       33
       +
       @@ -270,6 +270,18 @@ macro(configure_sdk_darwin

     

       34
       34
       +
          # Add this to the list of known SDKs.

     

       35
       35
       +
          list(APPEND SWIFT_CONFIGURED_SDKS "${prefix}")

     

       36
       36
       +
        

     

       37
       37
       +
       +  set(cxx_overlay_opt "")

     

       38
       38
       +
       +  if("${prefix}" STREQUAL "OSX")

     

       39
       39
       +
       +    file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags)

     

       40
       40
       +
       +    separate_arguments(nix_libcxx_cxxflags)

     

       41
       41
       +
       +    foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags})

     

       42
       42
       +
       +      set(cxx_overlay_opt ${cxx_overlay_opt} "-Xcc" "${nix_libcxx_cxxflag}")

     

       43
       43
       +
       +    endforeach()

     

       44
       44
       +
       +  endif()

     

       45
       45
       +
       +  set(SWIFT_SDK_${prefix}_CXX_OVERLAY_SWIFT_COMPILE_FLAGS

     

       46
       46
       +
       +      ${cxx_overlay_opt}

     

       47
       47
       +
       +    CACHE STRING "Extra flags for compiling the C++ overlay")

     

       48
       48
       +
       +

     

       49
       49
       +
          _report_sdk("${prefix}")

     

       50
       50
       +
        endmacro()

     

       51
       51
       +
        

     

       52
       52
       +
       --- a/stdlib/public/Cxx/std/CMakeLists.txt

     

       53
       53
       +
       +++ b/stdlib/public/Cxx/std/CMakeLists.txt

     

       54
       54
       +
       @@ -145,6 +145,9 @@ add_swift_target_library(swiftstd STATIC NO_LINK_NAME IS_STDLIB

     

       55
       55
       +
            SWIFT_COMPILE_FLAGS_LINUX

     

       56
       56
       +
            ${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

     

       57
       57
       +
        

     

       58
       58
       +
       +    SWIFT_COMPILE_FLAGS_OSX

     

       59
       59
       +
       +    ${SWIFT_SDK_OSX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

     

       60
       60
       +
       +

     

       61
       61
       +
            LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

     

       62
       62
       +
            TARGET_SDKS ALL_APPLE_PLATFORMS LINUX

     

       63
       63
       +
            INSTALL_IN_COMPONENT compiler

+14

pkgs/development/compilers/swift/compiler/patches/swift-darwin-link-cxxabi.patch

···

       1
       1
       +
       This patches the stdlib backdeploy static lib to have its users link c++abi.

     

       2
       2
       +
       Without this, later steps that try to link this fail looking for global

     

       3
       3
       +
       new/delete operators (__Znwm/__ZdlPv).

     

       4
       4
       +
       

     

       5
       5
       +
       --- a/stdlib/toolchain/Compatibility56/Overrides.cpp

     

       6
       6
       +
       +++ b/stdlib/toolchain/Compatibility56/Overrides.cpp

     

       7
       7
       +
       @@ -23,6 +23,7 @@

     

       8
       8
       +
        using namespace swift;

     

       9
       9
       +
        

     

       10
       10
       +
        __asm__ (".linker_option \"-lc++\"");

     

       11
       11
       +
       +__asm__ (".linker_option \"-lc++abi\"");

     

       12
       12
       +
        

     

       13
       13
       +
        #define OVERRIDE(name, ret, attrs, ccAttrs, namespace, typedArgs, namedArgs) \

     

       14
       14
       +
          Override_ ## name name;

+48

pkgs/development/compilers/swift/compiler/patches/swift-linux-fix-libc-paths.patch

···

       1
       1
       +
       This code injects an LLVM modulemap for glibc and libstdc++ by overriding

     

       2
       2
       +
       specific VFS paths. In order to do that, it needs to know the actual locations

     

       3
       3
       +
       of glibc and libstdc++, but it only searches `-sysroot` and fails. Here we

     

       4
       4
       +
       patch it to also consider `-idirafter` and `-isystem` as added by cc-wrapper.

     

       5
       5
       +
       

     

       6
       6
       +
       --- a/lib/ClangImporter/ClangIncludePaths.cpp

     

       7
       7
       +
       +++ b/lib/ClangImporter/ClangIncludePaths.cpp

     

       8
       8
       +
       @@ -120,6 +120,7 @@ static clang::driver::Driver createClangDriver(const ASTContext &ctx) {

     

       9
       9
       +
        /// \return a path without dots (`../`, './').

     

       10
       10
       +
        static llvm::Optional<Path>

     

       11
       11
       +
        findFirstIncludeDir(const llvm::opt::InputArgList &args,

     

       12
       12
       +
       +                    const llvm::opt::ArgList &DriverArgs,

     

       13
       13
       +
                            const ArrayRef<const char *> expectedFileNames) {

     

       14
       14
       +
          // C++ stdlib paths are added as `-internal-isystem`.

     

       15
       15
       +
          std::vector<std::string> includeDirs =

     

       16
       16
       +
       @@ -128,6 +129,14 @@ findFirstIncludeDir(const llvm::opt::InputArgList &args,

     

       17
       17
       +
          llvm::append_range(includeDirs,

     

       18
       18
       +
                             args.getAllArgValues(

     

       19
       19
       +
                                 clang::driver::options::OPT_internal_externc_isystem));

     

       20
       20
       +
       +  // Nix adds the C stdlib include path using `-idirafter`.

     

       21
       21
       +
       +  llvm::append_range(includeDirs,

     

       22
       22
       +
       +                     DriverArgs.getAllArgValues(

     

       23
       23
       +
       +                         clang::driver::options::OPT_idirafter));

     

       24
       24
       +
       +  // Nix adds the C++ stdlib include path using `-isystem`.

     

       25
       25
       +
       +  llvm::append_range(includeDirs,

     

       26
       26
       +
       +                     DriverArgs.getAllArgValues(

     

       27
       27
       +
       +                         clang::driver::options::OPT_isystem));

     

       28
       28
       +
        

     

       29
       29
       +
          for (const auto &includeDir : includeDirs) {

     

       30
       30
       +
            Path dir(includeDir);

     

       31
       31
       +
       @@ -193,7 +202,7 @@ getGlibcFileMapping(ASTContext &ctx) {

     

       32
       32
       +
          // Ideally we would check that all of the headers referenced from the

     

       33
       33
       +
          // modulemap are present.

     

       34
       34
       +
          Path glibcDir;

     

       35
       35
       +
       -  if (auto dir = findFirstIncludeDir(parsedIncludeArgs,

     

       36
       36
       +
       +  if (auto dir = findFirstIncludeDir(parsedIncludeArgs, clangDriverArgs,

     

       37
       37
       +
                                             {"inttypes.h", "unistd.h", "stdint.h"})) {

     

       38
       38
       +
            glibcDir = dir.value();

     

       39
       39
       +
          } else {

     

       40
       40
       +
       @@ -251,7 +260,7 @@ getLibStdCxxFileMapping(ASTContext &ctx) {

     

       41
       41
       +
          auto parsedStdlibArgs = parseClangDriverArgs(clangDriver, stdlibArgStrings);

     

       42
       42
       +
        

     

       43
       43
       +
          Path cxxStdlibDir;

     

       44
       44
       +
       -  if (auto dir = findFirstIncludeDir(parsedStdlibArgs,

     

       45
       45
       +
       +  if (auto dir = findFirstIncludeDir(parsedStdlibArgs, clangDriverArgs,

     

       46
       46
       +
                                             {"cstdlib", "string", "vector"})) {

     

       47
       47
       +
            cxxStdlibDir = dir.value();

     

       48
       48
       +
          } else {

+5 -5

pkgs/development/compilers/swift/compiler/patches/swift-nix-resource-root.patch

···

       7
       7
        
       

     

       8
       8
        
       --- a/lib/ClangImporter/ClangImporter.cpp

     

       9
       9
        
       +++ b/lib/ClangImporter/ClangImporter.cpp

     

       10
       10
       -
       @@ -68,6 +68,7 @@

     

       10
       10
       +
       @@ -73,6 +73,7 @@

     

       11
       11
        
        #include "llvm/Support/FileSystem.h"

     

       12
       12
        
        #include "llvm/Support/Memory.h"

     

       13
       13
        
        #include "llvm/Support/Path.h"

     

       14
       14
        
       +#include "llvm/Support/Process.h"

     

       15
       15
       +
        #include "llvm/Support/VirtualFileSystem.h"

     

       15
       16
        
        #include "llvm/Support/YAMLParser.h"

     

       16
       16
       -
        #include "llvm/Support/YAMLTraits.h"

     

       17
       17
        
        #include <algorithm>

     

       18
       18
       -
       @@ -809,6 +810,17 @@ importer::addCommonInvocationArguments(

     

       18
       18
       +
       @@ -786,6 +787,17 @@ importer::addCommonInvocationArguments(

     

       19
       19
        
        

     

       20
       20
        
          const std::string &overrideResourceDir = importerOpts.OverrideResourceDir;

     

       21
       21
        
          if (overrideResourceDir.empty()) {

     
···

       33
       33
        
            llvm::SmallString<128> resourceDir(searchPathOpts.RuntimeResourcePath);

     

       34
       34
        
        

     

       35
       35
        
            // Adjust the path to refer to our copy of the Clang resource directory

     

       36
       36
       -
       @@ -824,6 +836,7 @@ importer::addCommonInvocationArguments(

     

       36
       36
       +
       @@ -801,6 +813,7 @@ importer::addCommonInvocationArguments(

     

       37
       37
        
            // Set the Clang resource directory to the path we computed.

     

       38
       38
        
            invocationArgStrs.push_back("-resource-dir");

     

       39
       39
        
            invocationArgStrs.push_back(std::string(resourceDir.str()));

     
···

       43
       43
        
            invocationArgStrs.push_back(overrideResourceDir);

     

       44
       44
        
       --- a/lib/Driver/ToolChains.cpp

     

       45
       45
        
       +++ b/lib/Driver/ToolChains.cpp

     

       46
       46
       -
       @@ -1372,10 +1372,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args,

     

       46
       46
       +
       @@ -1393,10 +1393,20 @@ void ToolChain::getClangLibraryPath(const ArgList &Args,

     

       47
       47
        
                                            SmallString<128> &LibPath) const {

     

       48
       48
        
          const llvm::Triple &T = getTriple();

     

       49
       49

+9 -8

pkgs/development/compilers/swift/default.nix

···

       2
       2
        
       , pkgs

     

       3
       3
        
       , newScope

     

       4
       4
        
       , darwin

     

       5
       5
       -
       , llvmPackages_latest

     

       5
       5
       +
       , llvmPackages_15

     

       6
       6
        
       , overrideCC

     

       7
       7
        
       }:

     

       8
       8
        
       

     
···

       15
       15
        
           # Re-export this so we can rely on the minimum Swift SDK elsewhere.

     

       16
       16
        
           apple_sdk = pkgs.darwin.apple_sdk_11_0;

     

       17
       17
        
       

     

       18
       18
       -
           # Our current Clang on Darwin is v11, but we need at least v12. The

     

       19
       19
       -
           # following applies the newer Clang with the same libc overrides as

     

       20
       20
       -
           # `apple_sdk.stdenv`.

     

       18
       18
       +
           # Swift builds its own Clang for internal use. We wrap that clang with a

     

       19
       19
       +
           # cc-wrapper derived from the clang configured below. Because cc-wrapper

     

       20
       20
       +
           # applies a specific resource-root, the two versions are best matched, or

     

       21
       21
       +
           # we'll often run into compilation errors.

     

       21
       22
        
           #

     

       22
       22
       -
           # If 'latest' becomes an issue, recommend replacing it with v14, which is

     

       23
       23
       -
           # currently closest to the official Swift builds.

     

       23
       23
       +
           # The following selects the correct Clang version, matching the version

     

       24
       24
       +
           # used in Swift, and applies the same libc overrides as `apple_sdk.stdenv`.

     

       24
       25
        
           clang = if pkgs.stdenv.isDarwin

     

       25
       26
        
             then

     

       26
       26
       -
               llvmPackages_latest.clang.override rec {

     

       27
       27
       +
               llvmPackages_15.clang.override rec {

     

       27
       28
        
                 libc = apple_sdk.Libsystem;

     

       28
       29
        
                 bintools = pkgs.bintools.override { inherit libc; };

     

       29
       30
        
               }

     

       30
       31
        
             else

     

       31
       31
       -
               llvmPackages_latest.clang;

     

       32
       32
       +
               llvmPackages_15.clang;

     

       32
       33
        
       

     

       33
       34
        
           # Overrides that create a useful environment for swift packages, allowing

     

       34
       35
        
           # packaging with `swiftPackages.callPackage`. These are similar to

pkgs/development/compilers/swift/sourcekit-lsp/default.nix

···

       6
       6
        
       , swiftpm2nix

     

       7
       7
        
       , Foundation

     

       8
       8
        
       , XCTest

     

       9
       9
       +
       , pkg-config

     

       9
       10
        
       , sqlite

     

       10
       11
        
       , ncurses

     

       11
       12
        
       , CryptoKit

     
···

       31
       32
        
         buildInputs = [

     

       32
       33
        
           Foundation

     

       33
       34
        
           XCTest

     

       35
       35
       +
           pkg-config

     

       34
       36
        
           sqlite

     

       35
       37
        
           ncursesInput

     

       36
       38
        
         ]

+8 -7

pkgs/development/compilers/swift/sourcekit-lsp/generated/default.nix

···

       2
       2
        
       {

     

       3
       3
        
         workspaceStateFile = ./workspace-state.json;

     

       4
       4
        
         hashes = {

     

       5
       5
       -
           "indexstore-db" = "05d7l3fgcvbw8plaky3pgjm03x20a63z9r14njxg5qm2zcp5m6jx";

     

       5
       5
       +
           "indexstore-db" = "0lf96m82s8f6lv67wbcnm9ii01fgw4bsr4vn2xp07ydfj1iqy8il";

     

       6
       6
        
           "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";

     

       7
       7
        
           "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan";

     

       8
       8
       -
           "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";

     

       9
       9
       -
           "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05";

     

       10
       10
       -
           "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";

     

       11
       11
       -
           "swift-package-manager" = "0a3vahdkj35n0dkinwcgybgfb9dnq2lq1nknn874r38xbj3mhlff";

     

       8
       8
       +
           "swift-crypto" = "0kllp7j0hd8k67l9b9zr2c3ddc5bvshldchzivhcz3q31qvq9ag8";

     

       9
       9
       +
           "swift-driver" = "0cbvddj54k3sbw0vzlmzhccs7h43hi5kq6i3n2i0mysz3bf0c6zg";

     

       10
       10
       +
           "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s";

     

       11
       11
       +
           "swift-package-manager" = "1d1ngh7da42dm0rwkw7jzxa63a1rpc88wimm85w2j59cm446pk9k";

     

       12
       12
       +
           "swift-syntax" = "05394mzznmcrw246lyzsjsn1fmilj98jgkjyyxr2ynhnbgzp2jl2";

     

       12
       13
        
           "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";

     

       13
       13
       -
           "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz";

     

       14
       14
       -
           "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";

     

       14
       14
       +
           "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz";

     

       15
       15
       +
           "Yams" = "0b4lprxl4f6yqq0djnp394mxgmsxm2pljr7fh4f6ihdhnpwfsfvl";

     

       15
       16
        
         };

     

       16
       17
        
       }

+32 -15

pkgs/development/compilers/swift/sourcekit-lsp/generated/workspace-state.json

···

       12
       12
        
               },

     

       13
       13
        
               "state": {

     

       14
       14
        
                 "checkoutState": {

     

       15
       15
       -
                   "branch": "release/5.7",

     

       16
       16
       -
                   "revision": "9305648b0a8700434fa2e55eeacf7c7f4402a0d5"

     

       15
       15
       +
                   "branch": "release/5.8",

     

       16
       16
       +
                   "revision": "6caa12ab3bb6245eee4e09dce7677e64720c6545"

     

       17
       17
        
                 },

     

       18
       18
        
                 "name": "sourceControlCheckout"

     

       19
       19
        
               },

     
···

       63
       63
        
               },

     

       64
       64
        
               "state": {

     

       65
       65
        
                 "checkoutState": {

     

       66
       66
       -
                   "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",

     

       67
       67
       -
                   "version": "1.1.7"

     

       66
       66
       +
                   "revision": "75ec60b8b4cc0f085c3ac414f3dca5625fa3588e",

     

       67
       67
       +
                   "version": "2.2.4"

     

       68
       68
        
                 },

     

       69
       69
        
                 "name": "sourceControlCheckout"

     

       70
       70
        
               },

     
···

       80
       80
        
               },

     

       81
       81
        
               "state": {

     

       82
       82
        
                 "checkoutState": {

     

       83
       83
       -
                   "branch": "release/5.7",

     

       84
       84
       -
                   "revision": "82b274af66cfbb8f3131677676517b34d01e30fd"

     

       83
       83
       +
                   "branch": "release/5.8",

     

       84
       84
       +
                   "revision": "7cfe0c0b6e6297efe88a3ce34e6138ee7eda969e"

     

       85
       85
        
                 },

     

       86
       86
        
                 "name": "sourceControlCheckout"

     

       87
       87
        
               },

     
···

       97
       97
        
               },

     

       98
       98
        
               "state": {

     

       99
       99
        
                 "checkoutState": {

     

       100
       100
       -
                   "branch": "release/5.7",

     

       101
       101
       -
                   "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b"

     

       100
       100
       +
                   "branch": "release/5.8",

     

       101
       101
       +
                   "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9"

     

       102
       102
        
                 },

     

       103
       103
        
                 "name": "sourceControlCheckout"

     

       104
       104
        
               },

     
···

       114
       114
        
               },

     

       115
       115
        
               "state": {

     

       116
       116
        
                 "checkoutState": {

     

       117
       117
       -
                   "branch": "release/5.7",

     

       118
       118
       -
                   "revision": "c6e40adbfc78acc60ca464ae482b56442f9f34f4"

     

       117
       117
       +
                   "branch": "release/5.8",

     

       118
       118
       +
                   "revision": "6651d98a4ce3c6faa82768256ca286412bf4a04d"

     

       119
       119
        
                 },

     

       120
       120
        
                 "name": "sourceControlCheckout"

     

       121
       121
        
               },

     
···

       124
       124
        
             {

     

       125
       125
        
               "basedOn": null,

     

       126
       126
        
               "packageRef": {

     

       127
       127
       +
                 "identity": "swift-syntax",

     

       128
       128
       +
                 "kind": "remoteSourceControl",

     

       129
       129
       +
                 "location": "https://github.com/apple/swift-syntax.git",

     

       130
       130
       +
                 "name": "SwiftSyntax"

     

       131
       131
       +
               },

     

       132
       132
       +
               "state": {

     

       133
       133
       +
                 "checkoutState": {

     

       134
       134
       +
                   "branch": "release/5.8",

     

       135
       135
       +
                   "revision": "cd793adf5680e138bf2bcbaacc292490175d0dcd"

     

       136
       136
       +
                 },

     

       137
       137
       +
                 "name": "sourceControlCheckout"

     

       138
       138
       +
               },

     

       139
       139
       +
               "subpath": "swift-syntax"

     

       140
       140
       +
             },

     

       141
       141
       +
             {

     

       142
       142
       +
               "basedOn": null,

     

       143
       143
       +
               "packageRef": {

     

       127
       144
        
                 "identity": "swift-system",

     

       128
       145
        
                 "kind": "remoteSourceControl",

     

       129
       146
        
                 "location": "https://github.com/apple/swift-system.git",

     
···

       148
       165
        
               },

     

       149
       166
        
               "state": {

     

       150
       167
        
                 "checkoutState": {

     

       151
       151
       -
                   "branch": "release/5.7",

     

       152
       152
       -
                   "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3"

     

       168
       168
       +
                   "branch": "release/5.8",

     

       169
       169
       +
                   "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935"

     

       153
       170
        
                 },

     

       154
       171
        
                 "name": "sourceControlCheckout"

     

       155
       172
        
               },

     
···

       165
       182
        
               },

     

       166
       183
        
               "state": {

     

       167
       184
        
                 "checkoutState": {

     

       168
       168
       -
                   "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",

     

       169
       169
       -
                   "version": "4.0.6"

     

       185
       185
       +
                   "revision": "f47ba4838c30dbd59998a4e4c87ab620ff959e8a",

     

       186
       186
       +
                   "version": "5.0.5"

     

       170
       187
        
                 },

     

       171
       188
        
                 "name": "sourceControlCheckout"

     

       172
       189
        
               },

     
···

       174
       191
        
             }

     

       175
       192
        
           ]

     

       176
       193
        
         },

     

       177
       177
       -
         "version": 5

     

       194
       194
       +
         "version": 6

     

       178
       195
        
       }

+14 -13

pkgs/development/compilers/swift/sources.nix

···

       5
       5
        
         # These packages are all part of the Swift toolchain, and have a single

     

       6
       6
        
         # upstream version that should match. We also list the hashes here so a basic

     

       7
       7
        
         # version upgrade touches only this file.

     

       8
       8
       -
         version = "5.7.3";

     

       8
       8
       +
         version = "5.8";

     

       9
       9
        
         hashes = {

     

       10
       10
       -
           llvm-project = "sha256-IDtLPe0sXamnmovbFVKvmDMnci4u/A0urAPjWTYwJCo=";

     

       11
       11
       -
           sourcekit-lsp = "sha256-BT6+VCBSupKOg2mXo6HlkvNRc8pVZU772Mj3LKFamsU=";

     

       12
       12
       -
           swift = "sha256-essP2eIp1sLuROqk0OKGBPfJnvnyAW0moMk0cX1IVQQ=";

     

       13
       13
       -
           swift-cmark = "sha256-f0BoTs4HYdx/aJ9HIGCWMalhl8PvClWD6R4QK3qSgAw=";

     

       14
       14
       -
           swift-corelibs-foundation = "sha256-g78zKSq/b/pVFAD2k2SoMpzJQIpkxMvZOaSz5JPaQmA=";

     

       15
       15
       -
           swift-corelibs-libdispatch = "sha256-1qbXiC1k9+T+L6liqXKg6EZXqem6KEEx8OctuL4Kb2o=";

     

       16
       16
       -
           swift-corelibs-xctest = "sha256-qLUO9/3tkJWorDMEHgHd8VC3ovLLq/UWXJWMtb6CMN0=";

     

       17
       17
       -
           swift-docc = "sha256-WlXJMAnrlVPCM+iCIhG0Gyho76BsC2yVBEpX3m/WiIQ=";

     

       18
       18
       -
           swift-docc-render-artifact = "sha256-ttdurN/K7OX+I4577jG3YGeRs+GLUTc7BiiEZGmFD+s=";

     

       19
       19
       -
           swift-driver = "sha256-BUwsvw8pirvprUFfliLQMMHr6SHTSgeaJYc9lTEvi9E=";

     

       20
       20
       -
           swift-experimental-string-processing = "sha256-W0cQBkdR3A0hrV75Wwm0YULUDVg1bjT0O5w5VGBYDJs=";

     

       21
       21
       -
           swift-package-manager = "sha256-zlFYh1wdjUwOsnbagKnAtqXl3vKPcRtnA7YMORtUeyg=";

     

       10
       10
       +
           llvm-project = "sha256-0xwSAwwkzFgYO3mY1rHqV8TCeH2NpM7m3VUkCDqjcdE=";

     

       11
       11
       +
           sourcekit-lsp = "sha256-XDGq64LbpgBrRy3IvZNgsoLUePXECK5p10vQ8cUKeGE=";

     

       12
       12
       +
           swift = "sha256-EY2IImBCVLiUutvDQjNUiInwCNxZsCu1mZzYSjNd4+A=";

     

       13
       13
       +
           swift-cmark = "sha256-6xkO9kN6eXMAigjk+KyIgVhTyC50BxmkZmD4+9z6nz8=";

     

       14
       14
       +
           swift-corelibs-foundation = "sha256-yRjjxJRy1eTM9VG7/Fn60UMghPavsaoueH0V8cjaIyM=";

     

       15
       15
       +
           swift-corelibs-libdispatch = "sha256-XOAWuaGqWJtxhGIPXYT3PIvk5OK0rkY4g1IOybJUlm4=";

     

       16
       16
       +
           swift-corelibs-xctest = "sha256-uwxQhKUQ1xp5ao6kfkdlYOvMr6yAb5IaBIdOfoyf+n8=";

     

       17
       17
       +
           swift-docc = "sha256-k1ygYDZwF4Jo7iOkHxc/3NzfgN+8XNCks5aizxBgPjM=";

     

       18
       18
       +
           swift-docc-render-artifact = "sha256-vdSyICXOjlNSjZXzPRxa/5305pg6PG4xww9GYEV9m10=";

     

       19
       19
       +
           swift-driver = "sha256-7xsG3Bpf+wqisCMaPEuEg8CjGYO/0r8BX3pMUmRrezE=";

     

       20
       20
       +
           swift-experimental-string-processing = "sha256-ioXG6pQKjlAc2oF38Z7TGighyZN8w2ZAAtFUq83Ow6Q=";

     

       21
       21
       +
           swift-package-manager = "sha256-xd6ZpeXfMoHyVrJxz6XcDLPKBvc2nl1lgWXuLrJdq+E=";

     

       22
       22
       +
           swift-syntax = "sha256-gkpx/1sWWi9y917OJ1GSNFYXrJb6e2qI4JlV+38laRQ=";

     

       22
       23
        
         };

     

       23
       24
        
       

     

       24
       25
        
         # Create fetch derivations.

pkgs/development/compilers/swift/swift-docc/default.nix

···

       28
       28
        
       

     

       29
       29
        
         configurePhase = generated.configure;

     

       30
       30
        
       

     

       31
       31
       +
         # We only install the docc binary, so don't need the other products.

     

       32
       32
       +
         # This works around a failure building generate-symbol-graph:

     

       33
       33
       +
         #  Sources/generate-symbol-graph/main.swift:13:18: error: module 'SwiftDocC' was not compiled for testing

     

       34
       34
       +
         # TODO: Figure out the cause. It doesn't seem to happen outside Nixpkgs.

     

       35
       35
       +
         swiftpmFlags = "--product docc";

     

       36
       36
       +
       

     

       31
       37
        
         # TODO: Tests depend on indexstore-db being provided by an existing Swift

     

       32
       38
        
         # toolchain. (ie. looks for `../lib/libIndexStore.so` relative to swiftc.

     

       33
       39
        
         #doCheck = true;

+6 -7

pkgs/development/compilers/swift/swift-docc/generated/default.nix

···

       2
       2
        
       {

     

       3
       3
        
         workspaceStateFile = ./workspace-state.json;

     

       4
       4
        
         hashes = {

     

       5
       5
       -
           "swift-argument-parser" = "070gip241dgn3d0nxgwxva4vp6kbnf11g01q5yaq6kmflcmz58f2";

     

       6
       6
       -
           "swift-cmark" = "0xfchdgls3070z16in8ks69y8fpiajmyk7lmp5h7ym7164isa6bb";

     

       7
       7
       -
           "swift-crypto" = "0h054rq14jyg94aiymmp37vqz60a13dlczp5g09pln724j4ypv92";

     

       5
       5
       +
           "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";

     

       6
       6
       +
           "swift-cmark" = "1qswlh6j9mlfq8qj7xfqspla7w7rrzvplgcs4mgllgi012yfgwnp";

     

       7
       7
       +
           "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";

     

       8
       8
        
           "swift-docc-plugin" = "11d6nhi139yzk1lxxrixsbgyj1bnvmh40wj30y725q83nqq49ljh";

     

       9
       9
       -
           "swift-docc-symbolkit" = "14hb2wc09hisf2r2yny17z28z0m58cf4lnqaczad2x2hk4s1iayi";

     

       10
       10
       -
           "swift-lmdb" = "1m5y6x2vs1wflcv2c57rx87gh12sy0hkwy5iy9inxmda2mcs8qcb";

     

       11
       11
       -
           "swift-markdown" = "09270bfrwlp904cma29hsbhr1p25v8kwgvhcfi7lg2av7aaknd97";

     

       9
       9
       +
           "swift-docc-symbolkit" = "14w37wzbx1mygfwm4iv0ypj120n1axhk627rg5a7v8j0ln511r7s";

     

       10
       10
       +
           "swift-lmdb" = "0azmc24mnxn4pbda8w8v7hy3h0gqqm4br43pnr7lc4sfj3dcv43m";

     

       11
       11
       +
           "swift-markdown" = "1l4ydc0xyv88gnyc33p61qavdh8cv98c548n1icphrfd6i78yygw";

     

       12
       12
        
           "swift-nio" = "04bvay94b34ynmlvgyl9a7f431l3cf8k2zr483spv8mvyh1hxiqn";

     

       13
       13
       -
           "swift-nio-ssl" = "1ak4aldilmz0pnfgbwq1x4alr38nfyvx2pz7p2vi2plf82da80g5";

     

       14
       13
        
         };

     

       15
       14
        
       }

+13 -30

pkgs/development/compilers/swift/swift-docc/generated/workspace-state.json

···

       12
       12
        
               },

     

       13
       13
        
               "state": {

     

       14
       14
        
                 "checkoutState": {

     

       15
       15
       -
                   "revision": "d2930e8fcf9c33162b9fcc1d522bc975e2d4179b",

     

       16
       16
       -
                   "version": "1.0.1"

     

       15
       15
       +
                   "revision": "e394bf350e38cb100b6bc4172834770ede1b7232",

     

       16
       16
       +
                   "version": "1.0.3"

     

       17
       17
        
                 },

     

       18
       18
        
                 "name": "sourceControlCheckout"

     

       19
       19
        
               },

     
···

       29
       29
        
               },

     

       30
       30
        
               "state": {

     

       31
       31
        
                 "checkoutState": {

     

       32
       32
       -
                   "branch": "release/5.7-gfm",

     

       33
       33
       -
                   "revision": "792c1c3326327515ce9bf64c44196b7f4daab9a6"

     

       32
       32
       +
                   "branch": "gfm",

     

       33
       33
       +
                   "revision": "eb9a6a357b6816c68f4b194eaa5b67f3cd1fa5c3"

     

       34
       34
        
                 },

     

       35
       35
        
                 "name": "sourceControlCheckout"

     

       36
       36
        
               },

     
···

       46
       46
        
               },

     

       47
       47
        
               "state": {

     

       48
       48
        
                 "checkoutState": {

     

       49
       49
       -
                   "revision": "9680b7251cd2be22caaed8f1468bd9e8915a62fb",

     

       50
       50
       -
                   "version": "1.1.2"

     

       49
       49
       +
                   "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",

     

       50
       50
       +
                   "version": "1.1.7"

     

       51
       51
        
                 },

     

       52
       52
        
                 "name": "sourceControlCheckout"

     

       53
       53
        
               },

     
···

       80
       80
        
               },

     

       81
       81
        
               "state": {

     

       82
       82
        
                 "checkoutState": {

     

       83
       83
       -
                   "branch": "release/5.7",

     

       84
       84
       -
                   "revision": "8682202025906dce29a8b04f9263f40ba87b89d8"

     

       83
       83
       +
                   "branch": "main",

     

       84
       84
       +
                   "revision": "b45d1f2ed151d057b54504d653e0da5552844e34"

     

       85
       85
        
                 },

     

       86
       86
        
                 "name": "sourceControlCheckout"

     

       87
       87
        
               },

     
···

       97
       97
        
               },

     

       98
       98
        
               "state": {

     

       99
       99
        
                 "checkoutState": {

     

       100
       100
       -
                   "branch": "release/5.7",

     

       101
       101
       -
                   "revision": "6ea45a7ebf6d8f72bd299dfcc3299e284bbb92ee"

     

       100
       100
       +
                   "branch": "main",

     

       101
       101
       +
                   "revision": "584941b1236b15bad74d8163785d389c028b1ad8"

     

       102
       102
        
                 },

     

       103
       103
        
                 "name": "sourceControlCheckout"

     

       104
       104
        
               },

     
···

       114
       114
        
               },

     

       115
       115
        
               "state": {

     

       116
       116
        
                 "checkoutState": {

     

       117
       117
       -
                   "branch": "release/5.7",

     

       118
       118
       -
                   "revision": "d6cd065a7e4b6c3fad615dcd39890e095a2f63a2"

     

       117
       117
       +
                   "branch": "main",

     

       118
       118
       +
                   "revision": "d491147940587dbadfb3472354f4d0c6e063e061"

     

       119
       119
        
                 },

     

       120
       120
        
                 "name": "sourceControlCheckout"

     

       121
       121
        
               },

     
···

       137
       137
        
                 "name": "sourceControlCheckout"

     

       138
       138
        
               },

     

       139
       139
        
               "subpath": "swift-nio"

     

       140
       140
       -
             },

     

       141
       141
       -
             {

     

       142
       142
       -
               "basedOn": null,

     

       143
       143
       -
               "packageRef": {

     

       144
       144
       -
                 "identity": "swift-nio-ssl",

     

       145
       145
       -
                 "kind": "remoteSourceControl",

     

       146
       146
       -
                 "location": "https://github.com/apple/swift-nio-ssl.git",

     

       147
       147
       -
                 "name": "swift-nio-ssl"

     

       148
       148
       -
               },

     

       149
       149
       -
               "state": {

     

       150
       150
       -
                 "checkoutState": {

     

       151
       151
       -
                   "revision": "2e74773972bd6254c41ceeda827f229bccbf1c0f",

     

       152
       152
       -
                   "version": "2.15.0"

     

       153
       153
       -
                 },

     

       154
       154
       -
                 "name": "sourceControlCheckout"

     

       155
       155
       -
               },

     

       156
       156
       -
               "subpath": "swift-nio-ssl"

     

       157
       140
        
             }

     

       158
       141
        
           ]

     

       159
       142
        
         },

     

       160
       160
       -
         "version": 5

     

       143
       143
       +
         "version": 6

     

       161
       144
        
       }

+4 -4

pkgs/development/compilers/swift/swift-driver/generated/default.nix

···

       2
       2
        
       {

     

       3
       3
        
         workspaceStateFile = ./workspace-state.json;

     

       4
       4
        
         hashes = {

     

       5
       5
       -
           "swift-argument-parser" = "11did5snqj8chcbdbiyx84mpif940ls2pr1iikwivvfp63i248hm";

     

       6
       6
       -
           "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";

     

       5
       5
       +
           "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";

     

       6
       6
       +
           "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s";

     

       7
       7
        
           "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";

     

       8
       8
       -
           "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz";

     

       9
       9
       -
           "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";

     

       8
       8
       +
           "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz";

     

       9
       9
       +
           "Yams" = "11abhcfkmqm3cmh7vp7rqzvxd1zj02j2866a2pp6v9m89456xb76";

     

       10
       10
        
         };

     

       11
       11
        
       }

+9 -9

pkgs/development/compilers/swift/swift-driver/generated/workspace-state.json

···

       12
       12
        
               },

     

       13
       13
        
               "state": {

     

       14
       14
        
                 "checkoutState": {

     

       15
       15
       -
                   "revision": "e1465042f195f374b94f915ba8ca49de24300a0d",

     

       16
       16
       -
                   "version": "1.0.2"

     

       15
       15
       +
                   "revision": "e394bf350e38cb100b6bc4172834770ede1b7232",

     

       16
       16
       +
                   "version": "1.0.3"

     

       17
       17
        
                 },

     

       18
       18
        
                 "name": "sourceControlCheckout"

     

       19
       19
        
               },

     
···

       29
       29
        
               },

     

       30
       30
        
               "state": {

     

       31
       31
        
                 "checkoutState": {

     

       32
       32
       -
                   "branch": "release/5.7",

     

       33
       33
       -
                   "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b"

     

       32
       32
       +
                   "branch": "release/5.8",

     

       33
       33
       +
                   "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9"

     

       34
       34
        
                 },

     

       35
       35
        
                 "name": "sourceControlCheckout"

     

       36
       36
        
               },

     
···

       63
       63
        
               },

     

       64
       64
        
               "state": {

     

       65
       65
        
                 "checkoutState": {

     

       66
       66
       -
                   "branch": "release/5.7",

     

       67
       67
       -
                   "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3"

     

       66
       66
       +
                   "branch": "release/5.8",

     

       67
       67
       +
                   "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935"

     

       68
       68
        
                 },

     

       69
       69
        
                 "name": "sourceControlCheckout"

     

       70
       70
        
               },

     
···

       80
       80
        
               },

     

       81
       81
        
               "state": {

     

       82
       82
        
                 "checkoutState": {

     

       83
       83
       -
                   "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",

     

       84
       84
       -
                   "version": "4.0.6"

     

       83
       83
       +
                   "revision": "01835dc202670b5bb90d07f3eae41867e9ed29f6",

     

       84
       84
       +
                   "version": "5.0.1"

     

       85
       85
        
                 },

     

       86
       86
        
                 "name": "sourceControlCheckout"

     

       87
       87
        
               },

     
···

       89
       89
        
             }

     

       90
       90
        
           ]

     

       91
       91
        
         },

     

       92
       92
       -
         "version": 5

     

       92
       92
       +
         "version": 6

     

       93
       93
        
       }

+5 -5

pkgs/development/compilers/swift/swift-driver/patches/linux-fix-linking.patch

···

       1
       1
        
       --- a/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       2
       2
        
       +++ b/Sources/SwiftDriver/Jobs/GenericUnixToolchain+LinkerSupport.swift

     

       3
       3
       -
       @@ -9,6 +9,7 @@

     

       4
       4
       -
        // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

     

       3
       3
       +
       @@ -10,6 +10,7 @@

     

       5
       4
        
        //

     

       6
       5
        
        //===----------------------------------------------------------------------===//

     

       6
       6
       +
        

     

       7
       7
        
       +import Foundation

     

       8
       8
       -
        import TSCBasic

     

       9
       8
        
        import SwiftOptions

     

       10
       9
        
        

     

       11
       11
       -
       @@ -116,7 +117,20 @@ extension GenericUnixToolchain {

     

       10
       10
       +
        import func TSCBasic.lookupExecutablePath

     

       11
       11
       +
       @@ -120,7 +121,20 @@ extension GenericUnixToolchain {

     

       12
       12
        
              // just using `clang` and avoid a dependency on the C++ runtime.

     

       13
       13
        
              let clangTool: Tool =

     

       14
       14
        
                parsedOptions.hasArgument(.enableExperimentalCxxInterop) ? .clangxx : .clang

     
···

       30
       30
        
              if let toolsDirPath = parsedOptions.getLastArgument(.toolsDirectory) {

     

       31
       31
        
                // FIXME: What if this isn't an absolute path?

     

       32
       32
        
                let toolsDir = try AbsolutePath(validating: toolsDirPath.asSingle)

     

       33
       33
       -
       @@ -132,6 +146,7 @@ extension GenericUnixToolchain {

     

       33
       33
       +
       @@ -136,6 +150,7 @@ extension GenericUnixToolchain {

     

       34
       34
        
                commandLine.appendFlag("-B")

     

       35
       35
        
                commandLine.appendPath(toolsDir)

     

       36
       36
        
              }

+4 -4

pkgs/development/compilers/swift/swift-driver/patches/nix-resource-root.patch

···

       4
       4
        
       

     

       5
       5
        
       --- a/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       6
       6
        
       +++ b/Sources/SwiftDriver/Jobs/Toolchain+LinkerSupport.swift

     

       7
       7
       -
       @@ -9,6 +9,7 @@

     

       8
       8
       -
        // See https://swift.org/CONTRIBUTORS.txt for the list of Swift project authors

     

       7
       7
       +
       @@ -10,6 +10,7 @@

     

       9
       8
        
        //

     

       10
       9
        
        //===----------------------------------------------------------------------===//

     

       10
       10
       +
        

     

       11
       11
        
       +import Foundation

     

       12
       12
       -
        import TSCBasic

     

       13
       12
        
        import SwiftOptions

     

       14
       13
        
        

     

       15
       15
       -
       @@ -24,6 +25,13 @@ extension Toolchain {

     

       14
       14
       +
        import protocol TSCBasic.FileSystem

     

       15
       15
       +
       @@ -26,6 +27,13 @@ extension Toolchain {

     

       16
       16
        
            for targetInfo: FrontendTargetInfo,

     

       17
       17
        
            parsedOptions: inout ParsedOptions

     

       18
       18
        
          ) throws -> VirtualPath {

-3

pkgs/development/compilers/swift/swiftpm/cmake-glue.nix

···

       57
       57
        
         '';

     

       58
       58
        
       

     

       59
       59
        
         Yams = ''

     

       60
       60
       -
           add_library(CYaml SHARED IMPORTED)

     

       61
       61
       -
           set_property(TARGET CYaml PROPERTY IMPORTED_LOCATION "@out@/lib/libCYaml@sharedLibExt@")

     

       62
       62
       -
       

     

       63
       60
        
           add_library(Yams SHARED IMPORTED)

     

       64
       61
        
           set_property(TARGET Yams PROPERTY IMPORTED_LOCATION "@out@/lib/swift/@swiftOs@/libYams@sharedLibExt@")

     

       65
       62
        
         '';

+39 -10

pkgs/development/compilers/swift/swiftpm/default.nix

···

       8
       8
        
       , swiftpm2nix

     

       9
       9
        
       , Foundation

     

       10
       10
        
       , XCTest

     

       11
       11
       +
       , pkg-config

     

       11
       12
        
       , sqlite

     

       12
       13
        
       , ncurses

     

       13
       14
        
       , substituteAll

     
···

       38
       39
        
           propagatedBuildInputs = [ Foundation ];

     

       39
       40
        
           patches = [

     

       40
       41
        
             ./patches/cmake-disable-rpath.patch

     

       42
       42
       +
             ./patches/cmake-fix-quoting.patch

     

       41
       43
        
             ./patches/disable-index-store.patch

     

       42
       44
        
             ./patches/disable-sandbox.patch

     

       45
       45
       +
             ./patches/disable-xctest.patch

     

       43
       46
        
             ./patches/fix-clang-cxx.patch

     

       44
       44
       -
             (substituteAll {

     

       45
       45
       -
               src = ./patches/disable-xctest.patch;

     

       46
       46
       -
               inherit (builtins) storeDir;

     

       47
       47
       -
             })

     

       47
       47
       +
             ./patches/nix-pkgconfig-vars.patch

     

       48
       48
        
             (substituteAll {

     

       49
       49
        
               src = ./patches/fix-stdlib-path.patch;

     

       50
       50
        
               inherit (builtins) storeDir;

     
···

       60
       60
        
               --replace \

     

       61
       61
        
                 'librariesPath = applicationPath.parentDirectory' \

     

       62
       62
        
                 "librariesPath = AbsolutePath(\"$out\")"

     

       63
       63
       +
       

     

       64
       64
       +
             # Fix case-sensitivity issues.

     

       65
       65
       +
             # Upstream PR: https://github.com/apple/swift-package-manager/pull/6500

     

       66
       66
       +
             substituteInPlace Sources/CMakeLists.txt \

     

       67
       67
       +
               --replace \

     

       68
       68
       +
                 'packageCollectionsSigning' \

     

       69
       69
       +
                 'PackageCollectionsSigning'

     

       70
       70
       +
             substituteInPlace Sources/PackageCollectionsSigning/CMakeLists.txt \

     

       71
       71
       +
               --replace \

     

       72
       72
       +
                 'SubjectPublickeyInfo' \

     

       73
       73
       +
                 'SubjectPublicKeyInfo'

     

       74
       74
       +
             substituteInPlace Sources/PackageCollections/CMakeLists.txt \

     

       75
       75
       +
               --replace \

     

       76
       76
       +
                 'FilepackageCollectionsSourcesStorage' \

     

       77
       77
       +
                 'FilePackageCollectionsSourcesStorage'

     

       63
       78
        
           '';

     

       64
       79
        
         };

     

       65
       80
        
       

     
···

       67
       82
        
         runtimeDeps = [ git ]

     

       68
       83
        
           ++ lib.optionals stdenv.isDarwin [

     

       69
       84
        
             xcbuild.xcrun

     

       70
       70
       -
             # vtool is used to determine a minimum deployment target. This is part of

     

       71
       71
       -
             # cctools, but adding that as a build input puts an unwrapped linker in

     

       72
       72
       -
             # PATH, and breaks builds. This small derivation exposes just vtool.

     

       73
       73
       -
             (runCommandLocal "vtool" { } ''

     

       85
       85
       +
             # These tools are part of cctools, but adding that as a build input puts

     

       86
       86
       +
             # an unwrapped linker in PATH, and breaks builds. This small derivation

     

       87
       87
       +
             # exposes just the tools we need:

     

       88
       88
       +
             # - vtool is used to determine a minimum deployment target.

     

       89
       89
       +
             # - libtool is used to build static libraries.

     

       90
       90
       +
             (runCommandLocal "swiftpm-cctools" { } ''

     

       74
       91
        
               mkdir -p $out/bin

     

       75
       92
        
               ln -s ${cctools}/bin/vtool $out/bin/vtool

     

       93
       93
       +
               ln -s ${cctools}/bin/libtool $out/bin/libtool

     

       76
       94
        
             '')

     

       77
       95
        
           ];

     

       78
       96
        
       

     
···

       282
       300
        
             swift-tools-support-core

     

       283
       301
        
           ];

     

       284
       302
        
       

     

       303
       303
       +
           postPatch = ''

     

       304
       304
       +
             # Tries to link against CYaml, but that's private.

     

       305
       305
       +
             substituteInPlace Sources/SwiftDriver/CMakeLists.txt \

     

       306
       306
       +
               --replace CYaml ""

     

       307
       307
       +
           '';

     

       308
       308
       +
       

     

       285
       309
        
           postInstall = cmakeGlue.SwiftDriver + ''

     

       286
       310
        
             # Swift modules are not installed.

     

       287
       311
        
             mkdir -p $out/${swiftModuleSubdir}

     
···

       294
       318
        
           src = generated.sources.swift-crypto;

     

       295
       319
        
       

     

       296
       320
        
           postPatch = ''

     

       321
       321
       +
             # Fix use of hardcoded tool paths on Darwin.

     

       297
       322
        
             substituteInPlace CMakeLists.txt \

     

       298
       323
        
               --replace /usr/bin/ar $NIX_CC/bin/ar

     

       324
       324
       +
             substituteInPlace CMakeLists.txt \

     

       325
       325
       +
               --replace /usr/bin/ranlib $NIX_CC/bin/ranlib

     

       299
       326
        
           '';

     

       300
       327
        
       

     

       301
       328
        
           postInstall = cmakeGlue.SwiftCrypto + ''

     
···

       313
       340
        
       

     

       314
       341
        
           buildInputs = [

     

       315
       342
        
             llbuild

     

       343
       343
       +
             sqlite

     

       316
       344
        
             swift-argument-parser

     

       317
       345
        
             swift-collections

     

       318
       346
        
             swift-crypto

     
···

       342
       370
        
         ];

     

       343
       371
        
         buildInputs = [

     

       344
       372
        
           ncursesInput

     

       373
       373
       +
           pkg-config

     

       345
       374
        
           sqlite

     

       346
       375
        
           XCTest

     

       347
       376
        
         ]

     
···

       385
       414
        
       

     

       386
       415
        
           mkdir -p $out/bin $out/lib/swift

     

       387
       416
        
       

     

       388
       388
       -
           cp $binPath/swift-package $out/bin/

     

       417
       417
       +
           cp $binPath/swift-package-manager $out/bin/swift-package

     

       389
       418
        
           wrapProgram $out/bin/swift-package \

     

       390
       419
        
             --prefix PATH : ${lib.makeBinPath runtimeDeps}

     

       391
       391
       -
           for tool in swift-build swift-test swift-run swift-package-collection; do

     

       420
       420
       +
           for tool in swift-build swift-test swift-run swift-package-collection swift-experimental-destination; do

     

       392
       421
        
             ln -s $out/bin/swift-package $out/bin/$tool

     

       393
       422
        
           done

     

       394
       423

+5 -5

pkgs/development/compilers/swift/swiftpm/generated/default.nix

···

       4
       4
        
         hashes = {

     

       5
       5
        
           "swift-argument-parser" = "1jph9w7lk9nr20fsv2c8p4hisx3dda817fh7pybd0r0j1jwa9nmw";

     

       6
       6
        
           "swift-collections" = "1k6sjx5rqmp3gklny77b480hyzy6gkhpi23r0s8ljfbrcwawgnan";

     

       7
       7
       -
           "swift-crypto" = "020b8q4ss2k7a65r5dgh59z40i6sn7ij1allxkh8c8a9d0jzn313";

     

       8
       8
       -
           "swift-driver" = "1lcb5wqragc74nd0fjnk47lyph9hs0i9cps1mplvp2i91yzjqk05";

     

       9
       9
       -
           "swift-llbuild" = "07zbp2dyfqd1bnyg7snpr9brn40jf22ivly5v10mql3hrg76a18h";

     

       7
       7
       +
           "swift-crypto" = "0kllp7j0hd8k67l9b9zr2c3ddc5bvshldchzivhcz3q31qvq9ag8";

     

       8
       8
       +
           "swift-driver" = "0cbvddj54k3sbw0vzlmzhccs7h43hi5kq6i3n2i0mysz3bf0c6zg";

     

       9
       9
       +
           "swift-llbuild" = "106vnssh6pgy5s9dnq1hi1c9v2wkfydqgncg5dy7c9n23iisjy3s";

     

       10
       10
        
           "swift-system" = "0402hkx2q2dv27gccnn8ma79ngvwiwzkhcv4zlcdldmy6cgi0px7";

     

       11
       11
       -
           "swift-tools-support-core" = "134f9x44jnzdy8cwi6hs372dwbyqvr4qmsjzjy25wzpyv6m9rhrz";

     

       12
       12
       -
           "Yams" = "1893y13sis2aimi1a5kgkczbf06z4yig054xb565yg2xm13srb45";

     

       11
       11
       +
           "swift-tools-support-core" = "1qvblyiazv58qwyxgyk2dh5ymbab3y70vm2q81qs6rmv43hs8ciz";

     

       12
       12
       +
           "Yams" = "0b4lprxl4f6yqq0djnp394mxgmsxm2pljr7fh4f6ihdhnpwfsfvl";

     

       13
       13
        
         };

     

       14
       14
        
       }

+11 -11

pkgs/development/compilers/swift/swiftpm/generated/workspace-state.json

···

       46
       46
        
               },

     

       47
       47
        
               "state": {

     

       48
       48
        
                 "checkoutState": {

     

       49
       49
       -
                   "revision": "ddb07e896a2a8af79512543b1c7eb9797f8898a5",

     

       50
       50
       -
                   "version": "1.1.7"

     

       49
       49
       +
                   "revision": "75ec60b8b4cc0f085c3ac414f3dca5625fa3588e",

     

       50
       50
       +
                   "version": "2.2.4"

     

       51
       51
        
                 },

     

       52
       52
        
                 "name": "sourceControlCheckout"

     

       53
       53
        
               },

     
···

       63
       63
        
               },

     

       64
       64
        
               "state": {

     

       65
       65
        
                 "checkoutState": {

     

       66
       66
       -
                   "branch": "release/5.7",

     

       67
       67
       -
                   "revision": "82b274af66cfbb8f3131677676517b34d01e30fd"

     

       66
       66
       +
                   "branch": "release/5.8",

     

       67
       67
       +
                   "revision": "7cfe0c0b6e6297efe88a3ce34e6138ee7eda969e"

     

       68
       68
        
                 },

     

       69
       69
        
                 "name": "sourceControlCheckout"

     

       70
       70
        
               },

     
···

       80
       80
        
               },

     

       81
       81
        
               "state": {

     

       82
       82
        
                 "checkoutState": {

     

       83
       83
       -
                   "branch": "release/5.7",

     

       84
       84
       -
                   "revision": "564424db5fdb62dcb5d863bdf7212500ef03a87b"

     

       83
       83
       +
                   "branch": "release/5.8",

     

       84
       84
       +
                   "revision": "dccfc2e127a34b89a849407594cf2d604b598ba9"

     

       85
       85
        
                 },

     

       86
       86
        
                 "name": "sourceControlCheckout"

     

       87
       87
        
               },

     
···

       114
       114
        
               },

     

       115
       115
        
               "state": {

     

       116
       116
        
                 "checkoutState": {

     

       117
       117
       -
                   "branch": "release/5.7",

     

       118
       118
       -
                   "revision": "286b48b1d73388e1d49b2bb33aabf995838104e3"

     

       117
       117
       +
                   "branch": "release/5.8",

     

       118
       118
       +
                   "revision": "ac4871e01ef338cb95b5d28328cab0ec1dfae935"

     

       119
       119
        
                 },

     

       120
       120
        
                 "name": "sourceControlCheckout"

     

       121
       121
        
               },

     
···

       131
       131
        
               },

     

       132
       132
        
               "state": {

     

       133
       133
        
                 "checkoutState": {

     

       134
       134
       -
                   "revision": "9ff1cc9327586db4e0c8f46f064b6a82ec1566fa",

     

       135
       135
       -
                   "version": "4.0.6"

     

       134
       134
       +
                   "revision": "f47ba4838c30dbd59998a4e4c87ab620ff959e8a",

     

       135
       135
       +
                   "version": "5.0.5"

     

       136
       136
        
                 },

     

       137
       137
        
                 "name": "sourceControlCheckout"

     

       138
       138
        
               },

     
···

       140
       140
        
             }

     

       141
       141
        
           ]

     

       142
       142
        
         },

     

       143
       143
       -
         "version": 5

     

       143
       143
       +
         "version": 6

     

       144
       144
        
       }

+12

pkgs/development/compilers/swift/swiftpm/patches/cmake-fix-quoting.patch

···

       1
       1
       +
       --- a/Sources/PackageCollectionsSigning/CMakeLists.txt

     

       2
       2
       +
       +++ b/Sources/PackageCollectionsSigning/CMakeLists.txt

     

       3
       3
       +
       @@ -43,6 +43,7 @@ target_link_libraries(PackageCollectionsSigning PUBLIC

     

       4
       4
       +
          PackageCollectionsModel

     

       5
       5
       +
          TSCBasic)

     

       6
       6
       +
        target_link_libraries(PackageCollectionsSigning PRIVATE

     

       7
       7
       +
       -  PackageCollectionsSigningLibc

     

       8
       8
       +
       -  $<$<PLATFORM_ID:Darwin>:SHELL:-Xlinker -framework -Xlinker Security>)

     

       9
       9
       +
       +  PackageCollectionsSigningLibc)

     

       10
       10
       +
       +target_link_options(PackageCollectionsSigning PRIVATE

     

       11
       11
       +
       +  "$<$<PLATFORM_ID:Darwin>:SHELL:-Xlinker -framework -Xlinker Security>")

     

       12
       12
       +

+4 -4

pkgs/development/compilers/swift/swiftpm/patches/disable-sandbox.patch

···

       2
       2
        
       

     

       3
       3
        
       --- a/Sources/Basics/Sandbox.swift

     

       4
       4
        
       +++ b/Sources/Basics/Sandbox.swift

     

       5
       5
       -
       @@ -30,12 +30,14 @@ public enum Sandbox {

     

       5
       5
       +
       @@ -33,12 +33,14 @@ public enum Sandbox {

     

       6
       6
        
                readOnlyDirectories: [AbsolutePath] = []

     

       7
       7
       -
            ) -> [String] {

     

       7
       7
       +
            ) throws -> [String] {

     

       8
       8
        
                #if os(macOS)

     

       9
       9
        
       +        let env = ProcessInfo.processInfo.environment

     

       10
       10
        
       +        if env["NIX_BUILD_TOP"] == nil || env["IN_NIX_SHELL"] != nil {

     

       11
       11
       -
                let profile = macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories)

     

       11
       11
       +
                let profile = try macOSSandboxProfile(strictness: strictness, writableDirectories: writableDirectories, readOnlyDirectories: readOnlyDirectories)

     

       12
       12
        
                return ["/usr/bin/sandbox-exec", "-p", profile] + command

     

       13
       13
        
       -        #else

     

       14
       14
        
       +        }

     
···

       17
       17
        
                return command

     

       18
       18
        
       -        #endif

     

       19
       19
        
            }

     

       20
       20
       -
       

     

       20
       20
       +
        

     

       21
       21
        
            /// Basic strictness level of a sandbox applied to a command line.

+9 -20

pkgs/development/compilers/swift/swiftpm/patches/disable-xctest.patch

···

       1
       1
        
       XCTest is not fully open-source, only the Swift library parts. We don't have a

     

       2
       2
        
       command-line runner available, so disable support.

     

       3
       3
        
       

     

       4
       4
       -
       --- a/Sources/Commands/TestingSupport.swift

     

       5
       5
       -
       +++ b/Sources/Commands/TestingSupport.swift

     

       6
       6
       -
       @@ -60,7 +60,7 @@ enum TestingSupport {

     

       4
       4
       +
       --- a/Sources/Commands/Utilities/TestingSupport.swift

     

       5
       5
       +
       +++ b/Sources/Commands/Utilities/TestingSupport.swift

     

       6
       6
       +
       @@ -72,7 +72,7 @@ enum TestingSupport {

     

       7
       7
        
            /// - Returns: Array of TestSuite

     

       8
       8
       -
            static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, swiftOptions: SwiftToolOptions) throws -> [TestSuite] {

     

       8
       8
       +
            static func getTestSuites(fromTestAt path: AbsolutePath, swiftTool: SwiftTool, enableCodeCoverage: Bool, sanitizers: [Sanitizer]) throws -> [TestSuite] {

     

       9
       9
        
                // Run the correct tool.

     

       10
       10
        
       -        #if os(macOS)

     

       11
       11
        
       +        #if false

     

       12
       12
        
                let data: String = try withTemporaryFile { tempFile in

     

       13
       13
       -
                    let args = [try TestingSupport.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString]

     

       14
       14
       -
                    var env = try TestingSupport.constructTestEnvironment(toolchain: try swiftTool.getToolchain(), options: swiftOptions, buildParameters: swiftTool.buildParametersForTest())

     

       13
       13
       +
                    let args = [try Self.xctestHelperPath(swiftTool: swiftTool).pathString, path.pathString, tempFile.path.pathString]

     

       14
       14
       +
                    var env = try Self.constructTestEnvironment(

     

       15
       15
        
       --- a/Sources/swiftpm-xctest-helper/main.swift

     

       16
       16
        
       +++ b/Sources/swiftpm-xctest-helper/main.swift

     

       17
       17
       -
       @@ -9,8 +9,11 @@

     

       18
       18
       -
        */

     

       17
       17
       +
       @@ -11,8 +11,11 @@

     

       18
       18
       +
        //===----------------------------------------------------------------------===//

     

       19
       19
        
        

     

       20
       20
        
        #if os(macOS)

     

       21
       21
        
       -import XCTest

     
···

       27
       27
        
        

     

       28
       28
        
        /// A helper tool to get list of tests from a XCTest Bundle on macOS.

     

       29
       29
        
        ///

     

       30
       30
       -
       @@ -132,6 +135,7 @@ do {

     

       30
       30
       +
       @@ -134,6 +137,7 @@ do {

     

       31
       31
        
            exit(1)

     

       32
       32
        
        }

     

       33
       33
        
        

     
···

       35
       35
        
        #else

     

       36
       36
        
        

     

       37
       37
        
        #if os(Windows)

     

       38
       38
       -
       --- a/Sources/PackageModel/Destination.swift

     

       39
       39
       -
       +++ b/Sources/PackageModel/Destination.swift

     

       40
       40
       -
       @@ -174,7 +174,7 @@ public struct Destination: Encodable, Equatable {

     

       41
       41
       -
                    arguments: ["/usr/bin/xcrun", "--sdk", "macosx", "--show-sdk-platform-path"],

     

       42
       42
       -
                    environment: environment).spm_chomp()

     

       43
       43
       -
       

     

       44
       44
       -
       -        if let platformPath = platformPath, !platformPath.isEmpty {

     

       45
       45
       -
       +        if let platformPath = platformPath, !platformPath.isEmpty && !platformPath.starts(with: "@storeDir@") {

     

       46
       46
       -
                    // For XCTest framework.

     

       47
       47
       -
                    let fwk = AbsolutePath(platformPath).appending(

     

       48
       48
       -
                        components: "Developer", "Library", "Frameworks")

+24 -24

pkgs/development/compilers/swift/swiftpm/patches/fix-clang-cxx.patch

···

       2
       2
        
       doesn't pick up the arguments that enable C++ compilation in this case. Patch

     

       3
       3
        
       swiftpm to properly invoke clang++.

     

       4
       4
        
       

     

       5
       5
       +
       --- a/Sources/Build/BuildPlan.swift

     

       6
       6
       +
       +++ b/Sources/Build/BuildPlan.swift

     

       7
       7
       +
       @@ -2089,7 +2089,7 @@ public class BuildPlan: SPMBuildCore.BuildPlan {

     

       8
       8
       +
                for target in dependencies.staticTargets {

     

       9
       9
       +
                    if case let target as ClangTarget = target.underlyingTarget, target.isCXX {

     

       10
       10
       +
                        if buildParameters.hostTriple.isDarwin() {

     

       11
       11
       +
       -                    buildProduct.additionalFlags += ["-lc++"]

     

       12
       12
       +
       +                    buildProduct.additionalFlags += ["-lc++", "-lc++abi"]

     

       13
       13
       +
                        } else if buildParameters.hostTriple.isWindows() {

     

       14
       14
       +
                            // Don't link any C++ library.

     

       15
       15
       +
                        } else {

     

       5
       16
        
       --- a/Sources/Build/LLBuildManifestBuilder.swift

     

       6
       17
        
       +++ b/Sources/Build/LLBuildManifestBuilder.swift

     

       7
       7
       -
       @@ -782,7 +782,7 @@ extension LLBuildManifestBuilder {

     

       18
       18
       +
       @@ -786,7 +786,7 @@ extension LLBuildManifestBuilder {

     

       8
       19
        
        

     

       9
       20
        
                    args += ["-c", path.source.pathString, "-o", path.object.pathString]

     

       10
       21
        
        

     
···

       13
       24
        
                    args.insert(clangCompiler, at: 0)

     

       14
       25
        
        

     

       15
       26
        
                    let objectFileNode: Node = .file(path.object)

     

       16
       16
       -
       --- a/Sources/PackageModel/Destination.swift

     

       17
       17
       -
       +++ b/Sources/PackageModel/Destination.swift

     

       18
       18
       -
       @@ -153,7 +153,7 @@ public struct Destination: Encodable, Equatable {

     

       19
       19
       -
        

     

       20
       20
       -
                var extraCPPFlags: [String] = []

     

       21
       21
       -
        #if os(macOS)

     

       22
       22
       -
       -        extraCPPFlags += ["-lc++"]

     

       23
       23
       -
       +        extraCPPFlags += ["-lc++", "-lc++abi"]

     

       24
       24
       -
        #elseif os(Windows)

     

       25
       25
       -
                extraCPPFlags += []

     

       26
       26
       -
        #else

     

       27
       27
        
       --- a/Sources/PackageModel/Toolchain.swift

     

       28
       28
        
       +++ b/Sources/PackageModel/Toolchain.swift

     

       29
       29
       -
       @@ -20,7 +20,7 @@ public protocol Toolchain {

     

       30
       30
       -
            var macosSwiftStdlib: AbsolutePath { get }

     

       29
       29
       +
       @@ -23,7 +23,7 @@ public protocol Toolchain {

     

       30
       30
       +
            var macosSwiftStdlib: AbsolutePath { get throws }

     

       31
       31
        
        

     

       32
       32
        
            /// Path of the `clang` compiler.

     

       33
       33
        
       -    func getClangCompiler() throws -> AbsolutePath

     
···

       46
       46
        
        

     

       47
       47
        
            private let environment: EnvironmentVariables

     

       48
       48
        
        

     

       49
       49
       -
       @@ -150,29 +150,31 @@ public final class UserToolchain: Toolchain {

     

       49
       49
       +
       @@ -196,29 +196,31 @@ public final class UserToolchain: Toolchain {

     

       50
       50
        
            }

     

       51
       51
        
        

     

       52
       52
        
            /// Returns the path to clang compiler tool.

     
···

       70
       70
        
                // Then, check the toolchain.

     

       71
       71
        
       +        let tool = isCXX ? "clang++" : "clang";

     

       72
       72
        
                do {

     

       73
       73
       -
       -            if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.binDir) {

     

       73
       73
       +
       -            if let toolPath = try? UserToolchain.getTool("clang", binDir: self.destination.toolchainBinDir) {

     

       74
       74
        
       -                self._clangCompiler = toolPath

     

       75
       75
        
       +            if let toolPath = try? UserToolchain.getTool(tool, binDir: self.destination.binDir) {

     

       76
       76
        
       +                self._clangCompiler[isCXX] = toolPath

     
···

       88
       88
        
        

     

       89
       89
        
       --- a/Sources/SPMBuildCore/BuildParameters.swift

     

       90
       90
        
       +++ b/Sources/SPMBuildCore/BuildParameters.swift

     

       91
       91
       -
       @@ -342,7 +342,7 @@ private struct _Toolchain: Encodable {

     

       91
       91
       +
       @@ -394,7 +394,7 @@ private struct _Toolchain: Encodable {

     

       92
       92
        
            public func encode(to encoder: Encoder) throws {

     

       93
       93
        
                var container = encoder.container(keyedBy: CodingKeys.self)

     

       94
       94
        
                try container.encode(toolchain.swiftCompilerPath, forKey: .swiftCompiler)

     

       95
       95
        
       -        try container.encode(toolchain.getClangCompiler(), forKey: .clangCompiler)

     

       96
       96
        
       +        try container.encode(toolchain.getClangCompiler(isCXX: false), forKey: .clangCompiler)

     

       97
       97
        
        

     

       98
       98
       -
                try container.encode(toolchain.extraCCFlags, forKey: .extraCCFlags)

     

       99
       99
       -
                try container.encode(toolchain.extraCPPFlags, forKey: .extraCPPFlags)

     

       98
       98
       +
                try container.encode(toolchain.extraFlags.cCompilerFlags, forKey: .extraCCFlags)

     

       99
       99
       +
                // Maintaining `extraCPPFlags` key for compatibility with older encoding.

     

       100
       100
        
       --- a/Sources/XCBuildSupport/XcodeBuildSystem.swift

     

       101
       101
        
       +++ b/Sources/XCBuildSupport/XcodeBuildSystem.swift

     

       102
       102
       -
       @@ -172,7 +172,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {

     

       102
       102
       +
       @@ -182,7 +182,7 @@ public final class XcodeBuildSystem: SPMBuildCore.BuildSystem {

     

       103
       103
        
                // Generate a table of any overriding build settings.

     

       104
       104
        
                var settings: [String: String] = [:]

     

       105
       105
        
                // An error with determining the override should not be fatal here.

     
···

       107
       107
        
       +        settings["CC"] = try? buildParameters.toolchain.getClangCompiler(isCXX: false).pathString

     

       108
       108
        
                // Always specify the path of the effective Swift compiler, which was determined in the same way as for the native build system.

     

       109
       109
        
                settings["SWIFT_EXEC"] = buildParameters.toolchain.swiftCompilerPath.pathString

     

       110
       110
       -
                settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(buildParameters.toolchain.toolchainLibDir.pathString)"

     

       110
       110
       +
                settings["LIBRARY_SEARCH_PATHS"] = "$(inherited) \(try buildParameters.toolchain.toolchainLibDir.pathString)"

     

       111
       111
        
       --- a/Tests/BuildTests/MockBuildTestHelper.swift

     

       112
       112
        
       +++ b/Tests/BuildTests/MockBuildTestHelper.swift

     

       113
       113
       -
       @@ -15,7 +15,7 @@ struct MockToolchain: PackageModel.Toolchain {

     

       113
       113
       +
       @@ -23,7 +23,7 @@ struct MockToolchain: PackageModel.Toolchain {

     

       114
       114
        
            #else

     

       115
       115
       -
            let extraCPPFlags: [String] = ["-lstdc++"]

     

       115
       115
       +
            let extraFlags = BuildFlags(cxxCompilerFlags: ["-lstdc++"])

     

       116
       116
        
            #endif

     

       117
       117
        
       -    func getClangCompiler() throws -> AbsolutePath {

     

       118
       118
        
       +    func getClangCompiler(isCXX: Bool) throws -> AbsolutePath {

     

       119
       119
       -
                return AbsolutePath("/fake/path/to/clang")

     

       119
       119
       +
                return AbsolutePath(path: "/fake/path/to/clang")

     

       120
       120
        
            }

     

       121
       121

+15 -13

pkgs/development/compilers/swift/swiftpm/patches/fix-stdlib-path.patch

···

       4
       4
        
       

     

       5
       5
        
       --- a/Sources/PackageModel/Toolchain.swift

     

       6
       6
        
       +++ b/Sources/PackageModel/Toolchain.swift

     

       7
       7
       -
       @@ -43,10 +43,16 @@ extension Toolchain {

     

       8
       8
       -
            }

     

       7
       7
       +
       @@ -53,12 +53,18 @@ extension Toolchain {

     

       9
       8
        
        

     

       10
       10
       -
            public var macosSwiftStdlib: AbsolutePath { 

     

       11
       11
       -
       +        if swiftCompilerPath.pathString.starts(with: "@storeDir@") {

     

       12
       12
       -
       +            return AbsolutePath("@swiftLib@/lib/swift/macosx")

     

       13
       13
       -
       +        }

     

       14
       14
       -
                return AbsolutePath("../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath))

     

       9
       9
       +
            public var macosSwiftStdlib: AbsolutePath {

     

       10
       10
       +
                get throws {

     

       11
       11
       +
       +            if swiftCompilerPath.pathString.starts(with: "@storeDir@") {

     

       12
       12
       +
       +                return AbsolutePath("@swiftLib@/lib/swift/macosx")

     

       13
       13
       +
       +            }

     

       14
       14
       +
                    return try AbsolutePath(validating: "../../lib/swift/macosx", relativeTo: resolveSymlinks(swiftCompilerPath))

     

       15
       15
       +
                }

     

       15
       16
        
            }

     

       16
       17
        
        

     

       17
       18
        
            public var toolchainLibDir: AbsolutePath {

     

       18
       18
       -
       +        if swiftCompilerPath.pathString.starts(with: "@storeDir@") {

     

       19
       19
       -
       +            return AbsolutePath("@swiftLib@/lib")

     

       20
       20
       -
       +        }

     

       21
       21
       -
                // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary.

     

       22
       22
       -
                return AbsolutePath("../../lib", relativeTo: resolveSymlinks(swiftCompilerPath))

     

       23
       23
       -
            }

     

       19
       19
       +
                get throws {

     

       20
       20
       +
       +            if swiftCompilerPath.pathString.starts(with: "@storeDir@") {

     

       21
       21
       +
       +                return AbsolutePath("@swiftLib@/lib")

     

       22
       22
       +
       +            }

     

       23
       23
       +
                    // FIXME: Not sure if it's better to base this off of Swift compiler or our own binary.

     

       24
       24
       +
                    return try AbsolutePath(validating: "../../lib", relativeTo: resolveSymlinks(swiftCompilerPath))

     

       25
       25
       +
                }

+28

pkgs/development/compilers/swift/swiftpm/patches/nix-pkgconfig-vars.patch

···

       1
       1
       +
       Swift parses .pc files manually, but this means it bypasses our pkg-config

     

       2
       2
       +
       wrapper. That wrapper normally takes care of introducing the correct

     

       3
       3
       +
       PKG_CONFIG_PATH for cross compiling.

     

       4
       4
       +
       

     

       5
       5
       +
       --- a/Sources/PackageLoading/PkgConfig.swift

     

       6
       6
       +
       +++ b/Sources/PackageLoading/PkgConfig.swift

     

       7
       7
       +
       @@ -123,14 +123,17 @@ public struct PkgConfig {

     

       8
       8
       +
        

     

       9
       9
       +
            private static var envSearchPaths: [AbsolutePath] {

     

       10
       10
       +
                get throws {

     

       11
       11
       +
       -            if let configPath = ProcessEnv.vars["PKG_CONFIG_PATH"] {

     

       12
       12
       +
       +            var result: [AbsolutePath] = []

     

       13
       13
       +
       +            for envVar in ["PKG_CONFIG_PATH", "PKG_CONFIG_PATH_FOR_TARGET"] {

     

       14
       14
       +
       +            if let configPath = ProcessEnv.vars[envVar] {

     

       15
       15
       +
                        #if os(Windows)

     

       16
       16
       +
       -                return try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) })

     

       17
       17
       +
       +                result += try configPath.split(separator: ";").map({ try AbsolutePath(validating: String($0)) })

     

       18
       18
       +
                        #else

     

       19
       19
       +
       -                return try configPath.split(separator: ":").map({ try AbsolutePath(validating: String($0)) })

     

       20
       20
       +
       +                result += try configPath.split(separator: ":").map({ try AbsolutePath(validating: String($0)) })

     

       21
       21
       +
                        #endif

     

       22
       22
       +
                    }

     

       23
       23
       +
       -            return []

     

       24
       24
       +
       +            }

     

       25
       25
       +
       +            return result

     

       26
       26
       +
                }

     

       27
       27
       +
            }

     

       28
       28
       +
        }

+1 -1

pkgs/development/compilers/swift/wrapper/wrapper.sh

···

       105
       105
        
       

     

       106
       106
        
       for p in "${params[@]}"; do

     

       107
       107
        
           case "$p" in

     

       108
       108
       -
               -enable-cxx-interop)

     

       108
       108
       +
               -enable-cxx-interop | -enable-experimental-cxx-interop)

     

       109
       109
        
                   isCxx=1 ;;

     

       110
       110
        
           esac

     

       111
       111
        
       done