commit 37cad5dfd5c1a33f5e4e0b383fd1825cdac47b7c · pyrox.dev/nixpkgs

+21 -3

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

···

       146
        
             -e 's|^\s*exec|exec -a "$0"|g' \

     

       147
        
             -e 's|^\[\[ "${clang.cc}/bin/clang" = \*++ ]]|[[ "$0" = *++ ]]|' \

     

       148
        
             -e "s|${clang.cc}/bin/clang|$unwrappedClang|g" \

     

       149
       -
             -e "s|^\(\s*\)\($unwrappedClang\) \"@\\\$responseFile\"|\1argv0=\$0\n\1${bash}/bin/bash -c \"exec -a '\$argv0' \2 '@\$responseFile'\"|"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       150
        
           chmod a+x "$targetFile"

     

       151
        
         '';

     

       152
        
       

     
···

       180
        
           sed < '${swiftWrapper}' > "$targetFile" \

     

       181
        
             -e "s|@prog@|'$unwrappedSwift'|g" \

     

       182
        
             -e 's|@cc_wrapper@|${clangForWrappers}|g' \

     

       183
       -
             -e 's|exec "$prog"|exec -a "$0" "$prog"|g'

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       184
        
           chmod a+x "$targetFile"

     

       185
        
         '';

     

       186
        
       

     
···

       326
        
                inherit clang;

     

       327
        
              }

     

       328
        
            }

     

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

     

       330
        
            patch -p1 -d swift -i ${

     

       331
        
              replaceVars ./patches/swift-darwin-plistbuddy-workaround.patch {

     

       332
        
                inherit swiftArch;

     
···

       504
        
       

     

       505
        
           cmakeFlags="-GNinja"

     

       506
        
           buildProject swift-cmark

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       507
        
       

     

       508
        
           # Some notes:

     

       509
        
           # - The Swift build just needs Clang.

···

       146
        
             -e 's|^\s*exec|exec -a "$0"|g' \

     

       147
        
             -e 's|^\[\[ "${clang.cc}/bin/clang" = \*++ ]]|[[ "$0" = *++ ]]|' \

     

       148
        
             -e "s|${clang.cc}/bin/clang|$unwrappedClang|g" \

     

       149
       +
             -e "s|^\(\s*\)\($unwrappedClang\) \"@\\\$responseFile\"|\1argv0=\$0\n\1${bash}/bin/bash -c \"exec -a '\$argv0' \2 '@\$responseFile'\"|" \

     

       150
       +
           ${lib.optionalString (clang.libcxx != null) ''

     

       151
       +
             -e 's|$NIX_CXXSTDLIB_COMPILE_${clang.suffixSalt}|-isystem '$SWIFT_BUILD_ROOT'/libcxx/include/c++/v1|g'

     

       152
       +
           ''}

     

       153
        
           chmod a+x "$targetFile"

     

       154
        
         '';

     

       155
        
       

     
···

       183
        
           sed < '${swiftWrapper}' > "$targetFile" \

     

       184
        
             -e "s|@prog@|'$unwrappedSwift'|g" \

     

       185
        
             -e 's|@cc_wrapper@|${clangForWrappers}|g' \

     

       186
       +
             -e 's|exec "$prog"|exec -a "$0" "$prog"|g' \

     

       187
       +
           ${lib.optionalString (clang.libcxx != null) ''

     

       188
       +
             -e 's|$NIX_CXXSTDLIB_COMPILE_${clang.suffixSalt}|-isystem '$SWIFT_BUILD_ROOT'/libcxx/include/c++/v1|g'

     

       189
       +
           ''}

     

       190
        
           chmod a+x "$targetFile"

     

       191
        
         '';

     

       192
        
       

     
···

       332
        
                inherit clang;

     

       333
        
              }

     

       334
        
            }

     

       0
        
       
     

       335
        
            patch -p1 -d swift -i ${

     

       336
        
              replaceVars ./patches/swift-darwin-plistbuddy-workaround.patch {

     

       337
        
                inherit swiftArch;

     
···

       509
        
       

     

       510
        
           cmakeFlags="-GNinja"

     

       511
        
           buildProject swift-cmark

     

       512
       +
       

     

       513
       +
           ${lib.optionalString (clang.libcxx != null) ''

     

       514
       +
             # Install the libc++ headers corresponding to the LLVM version of

     

       515
       +
             # Swift’s Clang.

     

       516
       +
             cmakeFlags="

     

       517
       +
               -GNinja

     

       518
       +
               -DLLVM_ENABLE_RUNTIMES=libcxx;libcxxabi

     

       519
       +
               -DLIBCXXABI_INSTALL_INCLUDE_DIR=$dev/include/c++/v1

     

       520
       +
             "

     

       521
       +
             ninjaFlags="install-cxx-headers install-cxxabi-headers"

     

       522
       +
             buildProject libcxx llvm-project/runtimes

     

       523
       +
             unset ninjaFlags

     

       524
       +
           ''}

     

       525
        
       

     

       526
        
           # Some notes:

     

       527
        
           # - The Swift build just needs Clang.

-63

pkgs/development/compilers/swift/compiler/patches/swift-darwin-libcxx-flags.patch

···

       1
       -
       On Darwin, the SDK is a directory of stubs, and libc++ lives separately. We

     

       2
       -
       need to patch the CMake files in several places to make the build for C++

     

       3
       -
       interop succeed. The required flags can be read from cc-wrapper support files.

     

       4
       -
       

     

       5
       -
       --- a/SwiftCompilerSources/CMakeLists.txt

     

       6
       -
       +++ b/SwiftCompilerSources/CMakeLists.txt

     

       7
       -
       @@ -105,18 +105,11 @@ function(add_swift_compiler_modules_library name)

     

       8
       -
              get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

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

     

       10
       -
            endif()

     

       11
       -
       -    if(NOT EXISTS "${sdk_path}/usr/include/c++")

     

       12
       -
       -      # Darwin SDKs in Xcode 12 or older do not include libc++, which prevents clang from finding libc++ when invoked

     

       13
       -
       -      # from ClangImporter. This results in build errors. To workaround this, let's explicitly pass the path to libc++

     

       14
       -
       -      # to clang.

     

       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
       -
       -      get_filename_component(absolute_libcxx_path "${CMAKE_C_COMPILER}/../../include/c++/v1" REALPATH)

     

       17
       -
       -      if (EXISTS "${absolute_libcxx_path}")

     

       18
       -
       -        set(sdk_option ${sdk_option} "-Xcc" "-isystem" "-Xcc" "${absolute_libcxx_path}")

     

       19
       -
       -      else()

     

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

     

       21
       -
       -      endif()

     

       22
       -
       -    endif()

     

       23
       -
       +    file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags)

     

       24
       -
       +    separate_arguments(nix_libcxx_cxxflags)

     

       25
       -
       +    foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags})

     

       26
       -
       +      set(sdk_option ${sdk_option} "-Xcc" "${nix_libcxx_cxxflag}")

     

       27
       -
       +    endforeach()

     

       28
       -
          elseif(BOOTSTRAPPING_MODE STREQUAL "CROSSCOMPILE")

     

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

     

       30
       -
            get_filename_component(swift_exec_bin_dir ${ALS_SWIFT_EXEC} DIRECTORY)

     

       31
       -
       --- a/cmake/modules/SwiftConfigureSDK.cmake

     

       32
       -
       +++ b/cmake/modules/SwiftConfigureSDK.cmake

     

       33
       -
       @@ -270,6 +270,18 @@ macro(configure_sdk_darwin

     

       34
       -
          # Add this to the list of known SDKs.

     

       35
       -
          list(APPEND SWIFT_CONFIGURED_SDKS "${prefix}")

     

       36
       -
        

     

       37
       -
       +  set(cxx_overlay_opt "")

     

       38
       -
       +  if("${prefix}" STREQUAL "OSX")

     

       39
       -
       +    file(READ "$ENV{NIX_CC}/nix-support/libcxx-cxxflags" nix_libcxx_cxxflags)

     

       40
       -
       +    separate_arguments(nix_libcxx_cxxflags)

     

       41
       -
       +    foreach(nix_libcxx_cxxflag ${nix_libcxx_cxxflags})

     

       42
       -
       +      set(cxx_overlay_opt ${cxx_overlay_opt} "-Xcc" "${nix_libcxx_cxxflag}")

     

       43
       -
       +    endforeach()

     

       44
       -
       +  endif()

     

       45
       -
       +  set(SWIFT_SDK_${prefix}_CXX_OVERLAY_SWIFT_COMPILE_FLAGS

     

       46
       -
       +      ${cxx_overlay_opt}

     

       47
       -
       +    CACHE STRING "Extra flags for compiling the C++ overlay")

     

       48
       -
       +

     

       49
       -
          _report_sdk("${prefix}")

     

       50
       -
        endmacro()

     

       51
       -
        

     

       52
       -
       --- a/stdlib/public/Cxx/std/CMakeLists.txt

     

       53
       -
       +++ b/stdlib/public/Cxx/std/CMakeLists.txt

     

       54
       -
       @@ -145,6 +145,9 @@ add_swift_target_library(swiftstd STATIC NO_LINK_NAME IS_STDLIB

     

       55
       -
            SWIFT_COMPILE_FLAGS_LINUX

     

       56
       -
            ${SWIFT_SDK_LINUX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

     

       57
       -
        

     

       58
       -
       +    SWIFT_COMPILE_FLAGS_OSX

     

       59
       -
       +    ${SWIFT_SDK_OSX_CXX_OVERLAY_SWIFT_COMPILE_FLAGS}

     

       60
       -
       +

     

       61
       -
            LINK_FLAGS "${SWIFT_RUNTIME_SWIFT_LINK_FLAGS}"

     

       62
       -
            TARGET_SDKS ALL_APPLE_PLATFORMS LINUX

     

       63
       -
            INSTALL_IN_COMPONENT compiler

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

···

       41
        
                   --replace-fail \

     

       42
        
                     "-resource-dir=$out/resource-root" \

     

       43
        
                     "-resource-dir=${lib.getLib swift}/lib/swift/clang"

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       44
        
               '';

     

       45
        
           });

     

       46

···

       41
        
                   --replace-fail \

     

       42
        
                     "-resource-dir=$out/resource-root" \

     

       43
        
                     "-resource-dir=${lib.getLib swift}/lib/swift/clang"

     

       44
       +
               ''

     

       45
       +
               # We need the libc++ headers corresponding to the LLVM version of

     

       46
       +
               # Swift’s Clang.

     

       47
       +
               + lib.optionalString (clang.libcxx != null) ''

     

       48
       +
                 include -isystem "${lib.getDev swift}/include/c++/v1" > $out/nix-support/libcxx-cxxflags

     

       49
        
               '';

     

       50
        
           });

     

       51