Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
gnu-efi: Fix aarch64 cross-build
  • Loading branch information
shlevy committed Feb 25, 2018
1 parent 87270fb commit 0ac6d4a
Show file tree
Hide file tree
Showing 2 changed files with 10 additions and 8 deletions.
3 changes: 2 additions & 1 deletion lib/systems/inspect.nix
Expand Up @@ -38,7 +38,8 @@ rec {

Kexecable = map (family: { kernel = kernels.linux; cpu.family = family; })
[ "x86" "arm" "aarch64" "mips" ];
Efi = map (family: { cpu.family = family; }) [ "x86" "arm" ];
Efi = map (family: { cpu.family = family; })
[ "x86" "arm" "aarch64" ];
};

matchAnyAttrs = patterns:
Expand Down
15 changes: 8 additions & 7 deletions pkgs/development/libraries/gnu-efi/default.nix
Expand Up @@ -15,13 +15,14 @@ stdenv.mkDerivation rec {

makeFlags = [
"PREFIX=\${out}"
"CC=gcc"
"AS=as"
"LD=ld"
"AR=ar"
"RANLIB=ranlib"
"OBJCOPY=objcopy"
] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm";
"CC=${stdenv.cc.targetPrefix}gcc"
"AS=${stdenv.cc.targetPrefix}as"
"LD=${stdenv.cc.targetPrefix}ld"
"AR=${stdenv.cc.targetPrefix}ar"
"RANLIB=${stdenv.cc.targetPrefix}ranlib"
"OBJCOPY=${stdenv.cc.targetPrefix}objcopy"
] ++ stdenv.lib.optional stdenv.isArm "ARCH=arm"
++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64";

meta = with stdenv.lib; {
description = "GNU EFI development toolchain";
Expand Down

0 comments on commit 0ac6d4a

Please sign in to comment.