about summary refs log tree commit diff
path: root/pkgs/build-support/cc-wrapper
diff options
context:
space:
mode:
authorAdam Joseph <adam@westernsemico.com>2023-04-11 23:49:48 -0700
committerAdam Joseph <adam@westernsemico.com>2023-04-13 22:57:09 -0700
commitc1e956e0a9a6fbd955fb4f24318a1adefc5efb8c (patch)
treef98328e81c6d6fd824346940d7a101dea1851790 /pkgs/build-support/cc-wrapper
parent6f8a69ee313ada39e9b7c3136d011df4bb1d406c (diff)
cc-wrapper: deunify clang/gcc handling of `-B` flag
Closes #225779
Closes #225780
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r--pkgs/build-support/cc-wrapper/default.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index fdc1457cc469b..2031b0e1286ca 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -334,9 +334,11 @@ stdenv.mkDerivation {
     ##
     ## GCC libs for non-GCC support
     ##
-    + optionalString useGccForLibs ''
+    + optionalString (useGccForLibs && isClang) ''
 
       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
     ''