diff options
| author | Craig Hall <ch9871@gmail.com> | 2019-08-23 11:30:13 +0100 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2019-11-24 05:18:50 +0000 |
| commit | 62d64297932068b5afa25fb66ed396cd38ef293a (patch) | |
| tree | 77f88e6832f9cb6d0eb2fa916c3385f2665c93b6 /pkgs/development/compilers/gcc/9 | |
| parent | 069e9fd44928de4235b0a01dd0207fdd9b5b5359 (diff) | |
| download | nixpkgs-62d64297932068b5afa25fb66ed396cd38ef293a.tar nixpkgs-62d64297932068b5afa25fb66ed396cd38ef293a.tar.gz nixpkgs-62d64297932068b5afa25fb66ed396cd38ef293a.tar.bz2 nixpkgs-62d64297932068b5afa25fb66ed396cd38ef293a.tar.lz nixpkgs-62d64297932068b5afa25fb66ed396cd38ef293a.tar.xz nixpkgs-62d64297932068b5afa25fb66ed396cd38ef293a.tar.zst nixpkgs-62d64297932068b5afa25fb66ed396cd38ef293a.zip | |
gcc: Fix cross names
There was an issue with the dashes. (taken from commit e158e113a6b74f6cd0e1de9e976b882a03714bf8)
Diffstat (limited to 'pkgs/development/compilers/gcc/9')
| -rw-r--r-- | pkgs/development/compilers/gcc/9/default.nix | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/pkgs/development/compilers/gcc/9/default.nix b/pkgs/development/compilers/gcc/9/default.nix index 1fdba1baa29..7c3fbb6ea78 100644 --- a/pkgs/development/compilers/gcc/9/default.nix +++ b/pkgs/development/compilers/gcc/9/default.nix @@ -62,13 +62,13 @@ let majorVersion = "9"; /* 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; |