urbit/shrub
1
1
Fork 0
mirror of https://github.com/urbit/shrub.git synced 2024-11-30 22:15:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

nix: enable aarch64-linux platform string

Browse Source
This commit is contained in:
~botter-nidnul 2022-06-05 03:12:12 -05:00 committed by Joe Bryan
parent efa6477445
commit a1a2be47fe
4 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
default.nix
View File

@ -56,6 +56,9 @@ let
crossSystem = crossSystem =
if system == "x86_64-linux" && crossSystem == null && enableStatic then if system == "x86_64-linux" && crossSystem == null && enableStatic then
"x86_64-unknown-linux-musl" "x86_64-unknown-linux-musl"
else
if system == "aarch64-linux" && crossSystem == null && enableStatic then
"aarch64-unknown-linux-musl"
else else
crossSystem; crossSystem;
}; };

1
nix/default.nix
View File

@ -25,6 +25,7 @@ let
(import ./overlays/native.nix) (import ./overlays/native.nix)
# Specific overrides guarded by the host platform. # Specific overrides guarded by the host platform.
(import ./overlays/musl.nix) (import ./overlays/musl.nix)
(import ./overlays/arm.nix)
]; ];
}; };

2
nix/overlays/arm.nix
View File

@ -6,7 +6,7 @@ let
in prev.lib.optionalAttrs isAarch64 { in prev.lib.optionalAttrs isAarch64 {
libsigsegv = prev.libsigsegv.overrideAttrs (attrs: { libsigsegv = prev.libsigsegv.overrideAttrs (attrs: {
preConfigure = (old.preConfigure or "") + '' preConfigure = (prev.preConfigure or "") + ''
sed -i 's/^CFG_FAULT=$/CFG_FAULT=fault-linux-arm.h/' configure sed -i 's/^CFG_FAULT=$/CFG_FAULT=fault-linux-arm.h/' configure
''; '';
}); });

3
pkg/urbit/include/c/portable.h
View File

@ -113,8 +113,7 @@
# if defined(U3_OS_linux) # if defined(U3_OS_linux)
# ifdef __LP64__ # ifdef __LP64__
# ifdef U3_CPU_aarch64 # ifdef U3_CPU_aarch64
// XX not yet # define U3_OS_ARCH "aarch64-linux"
//# define U3_OS_ARCH "aarch64-linux"
# else # else
# define U3_OS_ARCH "x86_64-linux" # define U3_OS_ARCH "x86_64-linux"
# endif # endif