cafkafk/nixpkgs
cafkafk/nixpkgs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 2
nixpkgs/pkgs/development/compilers/swift/patches/glibc-arch-headers.patch

14 lines
697 B
Diff
Raw Normal View History

swift: 4.1.3 -> 4.2.1 * necessary tweaks and patches to get swift 4.2.1 to build * disabled more tests because they would require additional patching * delete empty directories from final build output * some minor cleanup
2018-11-01 15:28:41 +01:00
The Nix glibc headers do not use include/x86_64-linux-gnu subdirectories.
swift: 4.2.3 -> 5.0.1 update Swift * new tweaks to the build process are mostly documented inline * the swiftc wrapper needs the linker path for libicu * some older tweaks could be removed * remove fuzz from patches by updating line numbers * one build fix to libdispatch has been filed upstream
2019-04-29 17:50:46 +02:00
--- swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.493801403 +0200
+++ swift/stdlib/public/Platform/CMakeLists.txt 2019-04-09 20:14:44.577800593 +0200
@@ -68,7 +68,7 @@
swift: 4.1.3 -> 4.2.1 * necessary tweaks and patches to get swift 4.2.1 to build * disabled more tests because they would require additional patching * delete empty directories from final build output * some minor cleanup
2018-11-01 15:28:41 +01:00
endif()
set(GLIBC_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
- set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_ARCH_INCLUDE_PATH}")
+ set(GLIBC_ARCH_INCLUDE_PATH "${GLIBC_SYSROOT_RELATIVE_INCLUDE_PATH}")
swift: 4.2.3 -> 5.0.1 update Swift * new tweaks to the build process are mostly documented inline * the swiftc wrapper needs the linker path for libicu * some older tweaks could be removed * remove fuzz from patches by updating line numbers * one build fix to libdispatch has been filed upstream
2019-04-29 17:50:46 +02:00
if(NOT "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}" STREQUAL "/" AND NOT "${sdk}" STREQUAL "ANDROID")
swift: 4.1.3 -> 4.2.1 * necessary tweaks and patches to get swift 4.2.1 to build * disabled more tests because they would require additional patching * delete empty directories from final build output * some minor cleanup
2018-11-01 15:28:41 +01:00
set(GLIBC_INCLUDE_PATH "${SWIFT_SDK_${sdk}_ARCH_${arch}_PATH}${GLIBC_INCLUDE_PATH}")
Reference in a new issue Copy permalink