Merge master into staging-next

This commit is contained in:
Frederik Rietdijk
2019-11-05 14:17:37 +01:00
252 changed files with 5991 additions and 1658 deletions
@@ -1,4 +1,6 @@
{ stdenv, fetchurl, pciutils }: with stdenv.lib;
{ stdenv, buildPackages, fetchurl, pciutils }:
with stdenv.lib;
stdenv.mkDerivation rec {
pname = "gnu-efi";
@@ -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";