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 | |
| parent | 4549be7eb0bb3bc9062df47c6b916c5c072800e2 (diff) | |
Revert "cc-wrapper: add optional temporary hack for -B"
This reverts commit ac3acd956f730fa9870d4488c91699c8e2892a39.
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 5 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/13/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/development/compilers/llvm/rocm/default.nix | 3 | ||||
| -rw-r--r-- | pkgs/top-level/all-packages.nix | 3 |
4 files changed, 2 insertions, 12 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 '' diff --git a/pkgs/development/compilers/llvm/13/default.nix b/pkgs/development/compilers/llvm/13/default.nix index 528bfbe5314a4..e7ae839a6e5f2 100644 --- a/pkgs/development/compilers/llvm/13/default.nix +++ b/pkgs/development/compilers/llvm/13/default.nix @@ -1,5 +1,4 @@ { lowPrio, newScope, pkgs, lib, stdenv, cmake -, stdenv-tmpDropB , gccForLibs, preLibcCrossHeaders , libxml2, python3, isl, fetchFromGitHub, overrideCC, wrapCCWith, wrapBintoolsWith , buildLlvmTools # tools, but from the previous stage, for cross @@ -244,7 +243,7 @@ let inherit llvm_meta; stdenv = if stdenv.hostPlatform.useLLVM or false then overrideCC stdenv buildLlvmTools.clangNoCompilerRt - else stdenv-tmpDropB; + else stdenv; }; # N.B. condition is safe because without useLLVM both are the same. diff --git a/pkgs/development/compilers/llvm/rocm/default.nix b/pkgs/development/compilers/llvm/rocm/default.nix index e47b69c56b874..7c82cc4330b96 100644 --- a/pkgs/development/compilers/llvm/rocm/default.nix +++ b/pkgs/development/compilers/llvm/rocm/default.nix @@ -1,6 +1,5 @@ { lib , stdenv -, stdenv-tmpDropB , callPackage , overrideCC , wrapCCWith @@ -79,8 +78,6 @@ let # Runtimes runtimes = callPackage ./llvm.nix { - stdenv = stdenv-tmpDropB; - buildDocs = false; buildMan = false; buildTests = false; diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index a172ed16314a5..34084c54a833c 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -15545,9 +15545,6 @@ with pkgs; llvmPackages_rocm = recurseIntoAttrs (callPackage ../development/compilers/llvm/rocm { }); - # temporary hack; see PR #225846 - stdenv-tmpDropB = overrideCC stdenv (wrapCCWith { tmpDropB = true; inherit (stdenv.cc) cc; }); - lorri = callPackage ../tools/misc/lorri { inherit (darwin.apple_sdk.frameworks) CoreServices Security; }; |