b12f/nixpkgs
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge #212919: ubootTools: fix build by fixing -idirafter ordering

Browse source 
...into staging-next
This commit is contained in:
Vladimír Čunát 2023-01-28 08:45:47 +01:00
parent 710d53b658 8b3a31f923
commit 277d34fbdf
No known key found for this signature in database
GPG key ID: E747DF1F9575A3AA
1 changed files with 10 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
pkgs/misc/uboot/default.nix
View file

@ -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