diff options
| author | David McFarland <corngood@gmail.com> | 2024-02-20 23:21:08 -0400 |
|---|---|---|
| committer | David McFarland <corngood@gmail.com> | 2024-03-03 15:15:08 -0400 |
| commit | 043eab9a5ac2ac3bdabd541fb3180e80c47c2b2c (patch) | |
| tree | ecce5897d1bc8c7626497ae32f32adea1c9d1aec /pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch | |
| parent | 845b559abe7dea12b2f3d4a98cf5326e0f1e195b (diff) | |
| download | nixlib-043eab9a5ac2ac3bdabd541fb3180e80c47c2b2c.tar nixlib-043eab9a5ac2ac3bdabd541fb3180e80c47c2b2c.tar.gz nixlib-043eab9a5ac2ac3bdabd541fb3180e80c47c2b2c.tar.bz2 nixlib-043eab9a5ac2ac3bdabd541fb3180e80c47c2b2c.tar.lz nixlib-043eab9a5ac2ac3bdabd541fb3180e80c47c2b2c.tar.xz nixlib-043eab9a5ac2ac3bdabd541fb3180e80c47c2b2c.tar.zst nixlib-043eab9a5ac2ac3bdabd541fb3180e80c47c2b2c.zip | |
dotnetCorePackages.dotnet_8: init at 8.0.2
Diffstat (limited to 'pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch')
| -rw-r--r-- | pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch | 31 |
1 files changed, 31 insertions, 0 deletions
diff --git a/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch b/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch new file mode 100644 index 000000000000..fa2606c0c6cd --- /dev/null +++ b/pkgs/development/compilers/dotnet/stop-passing-bare-sdk-arg-to-swiftc.patch @@ -0,0 +1,31 @@ +From 85a940f3f039704da73ee177c1848cd4b6ed029f Mon Sep 17 00:00:00 2001 +From: David McFarland <corngood@gmail.com> +Date: Tue, 9 Jan 2024 15:10:00 -0400 +Subject: [PATCH] stop passing bare sdk arg to swiftc + +--- + .../CMakeLists.txt | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt b/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt +index b847f5c3cd..cf8344ead0 100644 +--- a/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt ++++ b/src/runtime/src/native/libs/System.Security.Cryptography.Native.Apple/CMakeLists.txt +@@ -49,9 +49,13 @@ if (NOT SWIFT_COMPILER_TARGET AND CLR_CMAKE_TARGET_OSX) + set(SWIFT_COMPILER_TARGET "${CMAKE_OSX_ARCHITECTURES}-apple-${SWIFT_PLATFORM}${SWIFT_DEPLOYMENT_TARGET}${SWIFT_PLATFORM_SUFFIX}") + endif() + ++if (CMAKE_OSX_SYSROOT) ++ set(SWIFT_ARGS -sdk ${CMAKE_OSX_SYSROOT}) ++endif() ++ + add_custom_command( + OUTPUT pal_swiftbindings.o +- COMMAND xcrun swiftc -emit-object -static -parse-as-library -runtime-compatibility-version none -sdk ${CMAKE_OSX_SYSROOT} -target ${SWIFT_COMPILER_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift -o pal_swiftbindings.o ++ COMMAND xcrun swiftc -emit-object -static -parse-as-library -runtime-compatibility-version none ${SWIFT_ARGS} -target ${SWIFT_COMPILER_TARGET} ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift -o pal_swiftbindings.o + MAIN_DEPENDENCY ${CMAKE_CURRENT_SOURCE_DIR}/pal_swiftbindings.swift + COMMENT "Compiling Swift file pal_swiftbindings.swift" + ) +-- +2.42.0 + |