cc-wrapper: deunify clang/gcc handling of -B flag

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,7 +334,7 @@ stdenv.mkDerivation {
     ##
     ## GCC libs for non-GCC support
     ##
-    + optionalString (useGccForLibs && !tmpDropB) ''
+    + optionalString (useGccForLibs && isClang) ''
 
       echo "-B${gccForLibs}/lib/gcc/${targetPlatform.config}/${gccForLibs.version}" >> $out/nix-support/cc-cflags
     ''

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
@@ -237,14 +236,14 @@ let
       inherit llvm_meta;
       stdenv = if stdenv.hostPlatform.useLLVM or false
                then overrideCC stdenv buildLlvmTools.clangNoCompilerRtWithLibc
-               else stdenv-tmpDropB;
+               else stdenv;
     };
 
     compiler-rt-no-libc = callPackage ./compiler-rt {
       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.

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;

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;
   };