forked from mirrors/nixpkgs
19a974945b
Always do pkg/default.nix not pkg.nix; use directories to avoid prefixing patches and other files.
33 lines
1.4 KiB
Diff
33 lines
1.4 KiB
Diff
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()
|
|
|