Skip to content

Commit

Permalink
gnu-efi: Use their crosscompilation support correctly
Browse files Browse the repository at this point in the history
IIUC, previously, the cross-compilation support was done in a somewhat
hacky way and was, basically, special-cased for ARM.

Now we use the cross-compilation support intergrated into their own
build system.

Test:

* nix-build --arg crossSystem '(import <nixpkgs/lib>).systems.examples.musl64' '<nixpkgs>' -A gnu-efi
  • Loading branch information
kirelagin committed Nov 3, 2019
1 parent 7827d3f commit 7cacaea
Showing 1 changed file with 6 additions and 9 deletions.
15 changes: 6 additions & 9 deletions pkgs/development/libraries/gnu-efi/default.nix
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
{ stdenv, fetchurl, pciutils }: with stdenv.lib;
{ stdenv, buildPackages, fetchurl, pciutils }:

with stdenv.lib;

stdenv.mkDerivation rec {
pname = "gnu-efi";
Expand All @@ -15,14 +17,9 @@ stdenv.mkDerivation rec {

makeFlags = [
"PREFIX=\${out}"
"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.isAarch32 "ARCH=arm"
++ stdenv.lib.optional stdenv.isAarch64 "ARCH=aarch64";
"HOSTCC=${buildPackages.stdenv.cc.targetPrefix}cc"
"CROSS_COMPILE=${stdenv.cc.targetPrefix}"
];

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

0 comments on commit 7cacaea

Please sign in to comment.