diff options
| author | Adam Joseph <adam@westernsemico.com> | 2023-04-12 08:15:45 -0700 |
|---|---|---|
| committer | Adam Joseph <adam@westernsemico.com> | 2023-04-12 10:26:23 -0700 |
| commit | 15e2a735f817d77f06139cd99ce52b3ec5272ccb (patch) | |
| tree | 0372a0193fa1ff6f8a5931ffefe6e2a3b676a62c /pkgs/build-support/cc-wrapper | |
| parent | 4549be7eb0bb3bc9062df47c6b916c5c072800e2 (diff) | |
Revert "cc-wrapper: add optional temporary hack for -B"
This reverts commit ac3acd956f730fa9870d4488c91699c8e2892a39.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 25aa558638fb9..fdc1457cc469b 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -51,7 +51,6 @@ # the derivation at which the `-B` and `-L` flags added by `useCcForLibs` will point , gccForLibs ? if useCcForLibs then cc else null -, tmpDropB ? false # temporary hack; see PR #225846 }: with lib; @@ -335,11 +334,9 @@ stdenv.mkDerivation { ## ## GCC libs for non-GCC support ## - + optionalString (useGccForLibs && !tmpDropB) '' + + optionalString useGccForLibs '' echo "-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-cflags - '' - + optionalString useGccForLibs '' echo "-L${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-ldflags echo "-L${gccForLibs.lib}/${targetPlatform.config}/lib" >> $out/nix-support/cc-ldflags '' |