diff options
| author | Andrew Childs <lorne@cons.org.nz> | 2020-05-10 03:50:19 +0900 |
|---|---|---|
| committer | Andrew Childs <lorne@cons.org.nz> | 2020-05-10 03:50:38 +0900 |
| commit | d91d2bdf77d4db115ce6a7acaf622100d7225668 (patch) | |
| tree | a21d4e12f702363084ed1bc37a5478221e26fb90 /pkgs/development/compilers/llvm/6 | |
| parent | 8325e0db1161507b2bffe629547dc3aac3526b5b (diff) | |
| download | nixlib-d91d2bdf77d4db115ce6a7acaf622100d7225668.tar nixlib-d91d2bdf77d4db115ce6a7acaf622100d7225668.tar.gz nixlib-d91d2bdf77d4db115ce6a7acaf622100d7225668.tar.bz2 nixlib-d91d2bdf77d4db115ce6a7acaf622100d7225668.tar.lz nixlib-d91d2bdf77d4db115ce6a7acaf622100d7225668.tar.xz nixlib-d91d2bdf77d4db115ce6a7acaf622100d7225668.tar.zst nixlib-d91d2bdf77d4db115ce6a7acaf622100d7225668.zip | |
compiler-rt: fix build on armv7l
Diffstat (limited to 'pkgs/development/compilers/llvm/6')
| -rw-r--r-- | pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch | 32 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/6/compiler-rt.nix | 1 |
2 files changed, 33 insertions, 0 deletions
diff --git a/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch b/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch new file mode 100644 index 000000000000..ca2ed632faa2 --- /dev/null +++ b/pkgs/development/compilers/llvm/6/compiler-rt-armv7l.patch @@ -0,0 +1,32 @@ +diff -ur compiler-rt-6.0.1.src/cmake/builtin-config-ix.cmake compiler-rt-6.0.1.src-patched/cmake/builtin-config-ix.cmake +--- compiler-rt-6.0.1.src/cmake/builtin-config-ix.cmake 2017-12-01 06:04:11.000000000 +0900 ++++ compiler-rt-6.0.1.src-patched/cmake/builtin-config-ix.cmake 2020-05-10 03:30:01.939694303 +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(X86 i386) + set(X86_64 x86_64) + set(MIPS32 mips mipsel) +diff -ur compiler-rt-6.0.1.src/lib/builtins/CMakeLists.txt compiler-rt-6.0.1.src-patched/lib/builtins/CMakeLists.txt +--- compiler-rt-6.0.1.src/lib/builtins/CMakeLists.txt 2017-12-25 06:11:32.000000000 +0900 ++++ compiler-rt-6.0.1.src-patched/lib/builtins/CMakeLists.txt 2020-05-10 03:30:44.814964156 +0900 +@@ -452,6 +452,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 +@@ -521,7 +522,7 @@ + set(_arch ${arch}) + if("${arch}" STREQUAL "armv6m") + set(_arch "arm|armv6m") +- elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7m|armv7em)$") ++ elseif("${arch}" MATCHES "^(armhf|armv7|armv7s|armv7k|armv7l|armv7m|armv7em)$") + set(_arch "arm") + endif() + diff --git a/pkgs/development/compilers/llvm/6/compiler-rt.nix b/pkgs/development/compilers/llvm/6/compiler-rt.nix index abb6796e3c78..89fca56f32c5 100644 --- a/pkgs/development/compilers/llvm/6/compiler-rt.nix +++ b/pkgs/development/compilers/llvm/6/compiler-rt.nix @@ -47,6 +47,7 @@ stdenv.mkDerivation { patches = [ ./compiler-rt-codesign.patch # Revert compiler-rt commit that makes codesign mandatory + ./compiler-rt-armv7l.patch ] ++ stdenv.lib.optional stdenv.hostPlatform.isMusl ./sanitizers-nongnu.patch; # TSAN requires XPC on Darwin, which we have no public/free source files for. We can depend on the Apple frameworks |