summary refs log tree commit diff
path: root/pkgs/build-support/cc-wrapper
diff options
context:
space:
mode:
authorMatthew Bauer <matthew.bauer@obsidian.systems>2018-07-26 20:16:28 -0400
committerMatthew Bauer <mjbauer95@gmail.com>2018-07-28 19:54:09 -0400
commit96ce1e03a4a3a395b2874fb1e3bbfe3358ded4bb (patch)
tree4bf7614cab9fa41b139cbb4307f64418da255948 /pkgs/build-support/cc-wrapper
parent82f3cd631c12322ea82b84a6162ae03fb140baf0 (diff)
downloadnixlib-96ce1e03a4a3a395b2874fb1e3bbfe3358ded4bb.tar
nixlib-96ce1e03a4a3a395b2874fb1e3bbfe3358ded4bb.tar.gz
nixlib-96ce1e03a4a3a395b2874fb1e3bbfe3358ded4bb.tar.bz2
nixlib-96ce1e03a4a3a395b2874fb1e3bbfe3358ded4bb.tar.lz
nixlib-96ce1e03a4a3a395b2874fb1e3bbfe3358ded4bb.tar.xz
nixlib-96ce1e03a4a3a395b2874fb1e3bbfe3358ded4bb.tar.zst
nixlib-96ce1e03a4a3a395b2874fb1e3bbfe3358ded4bb.zip
{cc,bintools}-wrapper: also replace . in config
Some configs will have dots for version numbers. To normalize we can
just use _ again.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
-rw-r--r--pkgs/build-support/cc-wrapper/default.nix4
1 files changed, 1 insertions, 3 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix
index aca96f58ed97..a981ffea7081 100644
--- a/pkgs/build-support/cc-wrapper/default.nix
+++ b/pkgs/build-support/cc-wrapper/default.nix
@@ -45,14 +45,12 @@ let
   default_cxx_stdlib_compile = optionalString (targetPlatform.isLinux && !(cc.isGNU or false) && !nativeTools && cc ? gcc)
     "-isystem $(echo -n ${cc.gcc}/include/c++/*) -isystem $(echo -n ${cc.gcc}/include/c++/*)/$(${cc.gcc}/bin/gcc -dumpmachine)";
 
-  dashlessTarget = stdenv.lib.replaceStrings ["-"] ["_"] targetPlatform.config;
-
   # The "infix salt" is a arbitrary string added in the middle of env vars
   # defined by cc-wrapper's hooks so that multiple cc-wrappers can be used
   # without interfering. For the moment, it is defined as the target triple,
   # adjusted to be a valid bash identifier. This should be considered an
   # unstable implementation detail, however.
-  infixSalt = dashlessTarget;
+  infixSalt = replaceStrings ["-" "."] ["_" "_"] targetPlatform.config;
 
   expand-response-params =
     if buildPackages.stdenv.cc or null != null && buildPackages.stdenv.cc != "/dev/null"