diff options
author | Alyssa Ross <hi@alyssa.is> | 2023-02-23 12:24:38 +0000 |
---|---|---|
committer | Alyssa Ross <hi@alyssa.is> | 2023-02-27 10:56:20 +0000 |
commit | e731fba41489e3065dddccf64000564ae9cab5db (patch) | |
tree | 90ea3f7db60f15ab32c2ef7ba49df22bfd3c5772 /pkgs/development/compilers/llvm | |
parent | 6b1f1c1b8c603dce85a203e7b33d2ce09ed82c53 (diff) | |
download | nixlib-e731fba41489e3065dddccf64000564ae9cab5db.tar nixlib-e731fba41489e3065dddccf64000564ae9cab5db.tar.gz nixlib-e731fba41489e3065dddccf64000564ae9cab5db.tar.bz2 nixlib-e731fba41489e3065dddccf64000564ae9cab5db.tar.lz nixlib-e731fba41489e3065dddccf64000564ae9cab5db.tar.xz nixlib-e731fba41489e3065dddccf64000564ae9cab5db.tar.zst nixlib-e731fba41489e3065dddccf64000564ae9cab5db.zip |
llvmPackages_git.compiler-rt: fix armv7l patch
Use the same patch as compiler-rt 15.
Diffstat (limited to 'pkgs/development/compilers/llvm')
-rw-r--r-- | pkgs/development/compilers/llvm/15/compiler-rt/default.nix | 2 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/common/compiler-rt/armv7l-15.patch (renamed from pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch) | 0 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/git/compiler-rt/armv7l.patch | 32 | ||||
-rw-r--r-- | pkgs/development/compilers/llvm/git/compiler-rt/default.nix | 4 |
4 files changed, 4 insertions, 34 deletions
diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix index 6f20d23b32bc..eb0be521daa8 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/15/compiler-rt/default.nix @@ -85,7 +85,7 @@ stdenv.mkDerivation { # See: https://github.com/NixOS/nixpkgs/pull/186575 ../../common/compiler-rt/darwin-plistbuddy-workaround.patch # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 - ./armv7l.patch + ../../common/compiler-rt/armv7l-15.patch ] # The `compiler-rt` build inspects `ld` to figure out whether it needs to # explicitly call `codesign`: diff --git a/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/common/compiler-rt/armv7l-15.patch index ca1c2332abd9..ca1c2332abd9 100644 --- a/pkgs/development/compilers/llvm/15/compiler-rt/armv7l.patch +++ b/pkgs/development/compilers/llvm/common/compiler-rt/armv7l-15.patch diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/armv7l.patch b/pkgs/development/compilers/llvm/git/compiler-rt/armv7l.patch deleted file mode 100644 index 120cfe6feb2a..000000000000 --- a/pkgs/development/compilers/llvm/git/compiler-rt/armv7l.patch +++ /dev/null @@ -1,32 +0,0 @@ -diff -ur compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake ---- compiler-rt-10.0.0.src/cmake/builtin-config-ix.cmake 2020-03-24 00:01:02.000000000 +0900 -+++ compiler-rt-10.0.0.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:42:00.883450706 +0900 -@@ -24,7 +24,7 @@ - - - set(ARM64 aarch64) --set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k) -+set(ARM32 arm armhf armv6m armv7m armv7em armv7 armv7s armv7k armv7l) - set(HEXAGON hexagon) - set(X86 i386) - set(X86_64 x86_64) -diff -ur compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt ---- compiler-rt-10.0.0.src/lib/builtins/CMakeLists.txt 2020-03-24 00:01:02.000000000 +0900 -+++ compiler-rt-10.0.0.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:44:49.468579650 +0900 -@@ -474,6 +474,7 @@ - set(armv7_SOURCES ${arm_SOURCES}) - set(armv7s_SOURCES ${arm_SOURCES}) - set(armv7k_SOURCES ${arm_SOURCES}) -+set(armv7l_SOURCES ${arm_SOURCES}) - set(arm64_SOURCES ${aarch64_SOURCES}) - - # macho_embedded archs -@@ -595,7 +596,7 @@ - foreach (arch ${BUILTIN_SUPPORTED_ARCH}) - if (CAN_TARGET_${arch}) - # For ARM archs, exclude any VFP builtins if VFP is not supported -- if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") -+ if (${arch} MATCHES "^(arm|armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") - string(REPLACE ";" " " _TARGET_${arch}_CFLAGS "${TARGET_${arch}_CFLAGS}") - check_compile_definition(__VFP_FP__ "${CMAKE_C_FLAGS} ${_TARGET_${arch}_CFLAGS}" COMPILER_RT_HAS_${arch}_VFP) - if(NOT COMPILER_RT_HAS_${arch}_VFP) diff --git a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix index 029f953c83e4..cac41e6014d6 100644 --- a/pkgs/development/compilers/llvm/git/compiler-rt/default.nix +++ b/pkgs/development/compilers/llvm/git/compiler-rt/default.nix @@ -75,8 +75,10 @@ stdenv.mkDerivation { ./normalize-var.patch # Prevent a compilation error on darwin ./darwin-targetconditionals.patch + # See: https://github.com/NixOS/nixpkgs/pull/186575 ../../common/compiler-rt/darwin-plistbuddy-workaround.patch - ./armv7l.patch + # See: https://github.com/NixOS/nixpkgs/pull/194634#discussion_r999829893 + ../../common/compiler-rt/armv7l-15.patch ]; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks |