Merge pull request #72694 from kirelagin/gnu-efi-cross

gnu-efi: Use their crosscompilation support correctly
This commit is contained in:
John Ericson 2019-11-03 15:14:29 -05:00 committed by GitHub
commit d8cf78466e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 9 deletions

View File

@ -1,4 +1,6 @@
{ stdenv, fetchurl, pciutils }: with stdenv.lib; { stdenv, buildPackages, fetchurl, pciutils }:
with stdenv.lib;
stdenv.mkDerivation rec { stdenv.mkDerivation rec {
pname = "gnu-efi"; pname = "gnu-efi";
@ -15,14 +17,9 @@ stdenv.mkDerivation rec {
makeFlags = [ makeFlags = [
"PREFIX=\${out}" "PREFIX=\${out}"
"CC=${stdenv.cc.targetPrefix}gcc" "HOSTCC=${buildPackages.stdenv.cc.targetPrefix}cc"
"AS=${stdenv.cc.targetPrefix}as" "CROSS_COMPILE=${stdenv.cc.targetPrefix}"
"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";
meta = with stdenv.lib; { meta = with stdenv.lib; {
description = "GNU EFI development toolchain"; description = "GNU EFI development toolchain";