diff options
| author | Sergei Trofimovich <slyich@gmail.com> | 2023-01-29 07:33:18 +0000 |
|---|---|---|
| committer | Sergei Trofimovich <slyich@gmail.com> | 2023-01-29 07:49:37 +0000 |
| commit | 25206ed9a89083889f386f8cd3c5a5a2611a5301 (patch) | |
| tree | 26639b04fe4da91157ba117388b37bb13d26c7d4 | |
| parent | e2e400e26726b8b74c1685dbc2a282559d8ff77d (diff) | |
| download | nixpkgs-25206ed9a89083889f386f8cd3c5a5a2611a5301.tar nixpkgs-25206ed9a89083889f386f8cd3c5a5a2611a5301.tar.gz nixpkgs-25206ed9a89083889f386f8cd3c5a5a2611a5301.tar.bz2 nixpkgs-25206ed9a89083889f386f8cd3c5a5a2611a5301.tar.lz nixpkgs-25206ed9a89083889f386f8cd3c5a5a2611a5301.tar.xz nixpkgs-25206ed9a89083889f386f8cd3c5a5a2611a5301.tar.zst nixpkgs-25206ed9a89083889f386f8cd3c5a5a2611a5301.zip | |
ubootTools: revert "fix build by fixing -idirafter ordering"
This reverts commit 8b3a31f923662bc3003be4943bc382c46136cb5f.
commit 8c80bd08b7e39229947d55104d1871f5066437d9
("build-support/cc-wrapper: pass in non-existent --sysroot= to untangle
from libc") was reverted. We can drop the workaround.
| -rw-r--r-- | pkgs/misc/uboot/default.nix | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/pkgs/misc/uboot/default.nix b/pkgs/misc/uboot/default.nix index 42d7021f345..a3600587250 100644 --- a/pkgs/misc/uboot/default.nix +++ b/pkgs/misc/uboot/default.nix @@ -92,16 +92,6 @@ 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 |