diff options
| author | Jan Malakhovski <oxij@oxij.org> | 2018-04-15 00:00:01 +0000 |
|---|---|---|
| committer | Jan Malakhovski <oxij@oxij.org> | 2018-04-26 15:06:52 +0000 |
| commit | 82dd4501f405800202b0485c1bab5575f30be80a (patch) | |
| tree | 2bcabb5d12f3bc2b9184b48aeafe0ff577d4dd41 /pkgs/build-support/cc-wrapper | |
| parent | 2afd3c901e4d1038ae0ba93bd3765002b997e815 (diff) | |
| download | nixlib-82dd4501f405800202b0485c1bab5575f30be80a.tar nixlib-82dd4501f405800202b0485c1bab5575f30be80a.tar.gz nixlib-82dd4501f405800202b0485c1bab5575f30be80a.tar.bz2 nixlib-82dd4501f405800202b0485c1bab5575f30be80a.tar.lz nixlib-82dd4501f405800202b0485c1bab5575f30be80a.tar.xz nixlib-82dd4501f405800202b0485c1bab5575f30be80a.tar.zst nixlib-82dd4501f405800202b0485c1bab5575f30be80a.zip | |
bintools-wrapper, cc-wrapper: don't add `targetPrefix` the second time
... binutils and gcc add it already anyway. Without this it's easy to get cross-toolchain paths longer than 256 chars and nix-daemon will then fail to commit them to /nix/store on XFS.
Diffstat (limited to 'pkgs/build-support/cc-wrapper')
| -rw-r--r-- | pkgs/build-support/cc-wrapper/default.nix | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/pkgs/build-support/cc-wrapper/default.nix b/pkgs/build-support/cc-wrapper/default.nix index 43cd87fb4597..700e7547b7ae 100644 --- a/pkgs/build-support/cc-wrapper/default.nix +++ b/pkgs/build-support/cc-wrapper/default.nix @@ -71,7 +71,7 @@ assert nativePrefix == bintools.nativePrefix; stdenv.mkDerivation { name = targetPrefix - + (if name != "" then name else "${ccName}-wrapper") + + (if name != "" then name else stdenv.lib.removePrefix targetPrefix "${ccName}-wrapper") + (stdenv.lib.optionalString (cc != null && ccVersion != "") "-${ccVersion}"); preferLocalBuild = true; |