Merge pull request #213106 from trofi/ipxe-fix-idirafter
ipxe: fix build by fixing -idirafter ordering
This commit is contained in:
commit
f123ea98cd
1 changed files with 10 additions and 0 deletions
|
@ -48,6 +48,16 @@ stdenv.mkDerivation rec {
|
|||
substituteInPlace src/util/genfsimg --replace " syslinux " " true "
|
||||
''; # calling syslinux on a FAT image isn't going to work
|
||||
|
||||
# Workaround '-idirafter' ordering bug in staging-next:
|
||||
# https://github.com/NixOS/nixpkgs/pull/210004
|
||||
# where libc '-idirafter' gets added after user's idirafter and
|
||||
# breaks.
|
||||
# TODO(trofi): remove it in staging once fixed in cc-wrapper.
|
||||
preConfigure = ''
|
||||
export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] buildPackages.stdenv.hostPlatform.config}=$(< ${buildPackages.stdenv.cc}/nix-support/libc-cflags)
|
||||
export NIX_CFLAGS_COMPILE_BEFORE_${lib.replaceStrings ["-" "."] ["_" "_"] stdenv.hostPlatform.config}=$(< ${stdenv.cc}/nix-support/libc-cflags)
|
||||
'';
|
||||
|
||||
# not possible due to assembler code
|
||||
hardeningDisable = [ "pic" "stackprotector" ];
|
||||
|
||||
|
|
Loading…
Reference in a new issue