mirror of
https://github.com/NixOS/nixpkgs.git
synced 2024-11-24 07:53:19 +00:00
Merge #212919: ubootTools: fix build by fixing -idirafter ordering
...into staging-next
This commit is contained in:
commit
277d34fbdf
@ -92,6 +92,16 @@ let
|
||||
|
||||
passAsFile = [ "extraConfig" ];
|
||||
|
||||
# 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)
|
||||
'';
|
||||
|
||||
configurePhase = ''
|
||||
runHook preConfigure
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user