diff options
author | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-25 21:51:57 +0100 |
---|---|---|
committer | Frederik Rietdijk <fridh@fridh.nl> | 2019-11-25 21:51:57 +0100 |
commit | 06a054e6eb9d5ad395aa89e598205aa2c56afb61 (patch) | |
tree | 91254460e5216addfcfa8aa457d3d480ed448b47 /pkgs/development/compilers/gcc/7/default.nix | |
parent | 2a2d3de78c950d46922f9aa13c3ff531cb142310 (diff) | |
parent | 646b279c55780fa8cfe79b2a3b1e3ab53b445be7 (diff) | |
download | nixpkgs-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar nixpkgs-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.gz nixpkgs-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.bz2 nixpkgs-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.lz nixpkgs-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.xz nixpkgs-06a054e6eb9d5ad395aa89e598205aa2c56afb61.tar.zst nixpkgs-06a054e6eb9d5ad395aa89e598205aa2c56afb61.zip |
Merge master into staging-next
Diffstat (limited to 'pkgs/development/compilers/gcc/7/default.nix')
-rw-r--r-- | pkgs/development/compilers/gcc/7/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/7/default.nix b/pkgs/development/compilers/gcc/7/default.nix index aa46a526389..d860cf64a38 100644 --- a/pkgs/development/compilers/gcc/7/default.nix +++ b/pkgs/development/compilers/gcc/7/default.nix @@ -72,13 +72,13 @@ let majorVersion = "7"; /* Cross-gcc settings (build == host != target) */ crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt"; - stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; - crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; + stageNameAddon = if crossStageStatic then "stage-static" else "stage-final"; + crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-"; in stdenv.mkDerivation ({ - name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}"; + name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}"; builder = ../builder.sh; |