git.iko.soy/typeable/nixpkgs
on master help sign in
Merge pull request #74016 from Ericson2314/gcc-fix-cross-name

gcc: Fix cross names

commit195c263a812dec532656dcfd5d0360458cdc93fd authorJohn Ericson <git@JohnEricson.me> dateSun 24 Nov 2019, 11:03 (7 years ago) parent82d389262d6429
8 files changed+24−24
pkgs/development/compilers/gcc/4.8/default.nix+3−3 pkgs/development/compilers/gcc/4.9/default.nix+3−3 pkgs/development/compilers/gcc/5/default.nix+3−3 pkgs/development/compilers/gcc/6/default.nix+3−3 pkgs/development/compilers/gcc/7/default.nix+3−3 pkgs/development/compilers/gcc/8/default.nix+3−3 pkgs/development/compilers/gcc/9/default.nix+3−3 pkgs/development/compilers/gcc/snapshot/default.nix+3−3
pkgs/development/compilers/gcc/4.8/default.nix+3−3
@@ -102,8 +102,8 @@ let majorVersion = "4";
102102
103103 /* Cross-gcc settings (build == host != target) */
104104 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
105− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
106− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
105+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
106+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
107107
108108in
109109
@@ -111,7 +111,7 @@ in
111111assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
112112
113113stdenv.mkDerivation ({
114− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
114+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
115115
116116 builder = ../builder.sh;
117117
pkgs/development/compilers/gcc/4.9/default.nix+3−3
@@ -107,8 +107,8 @@ let majorVersion = "4";
107107
108108 /* Cross-gcc settings (build == host != target) */
109109 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
110− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
111− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
110+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
111+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
112112
113113in
114114
@@ -116,7 +116,7 @@ in
116116assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
117117
118118stdenv.mkDerivation ({
119− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
119+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
120120
121121 builder = ../builder.sh;
122122
pkgs/development/compilers/gcc/5/default.nix+3−3
@@ -98,8 +98,8 @@ let majorVersion = "5";
9898
9999 /* Cross-gcc settings (build == host != target) */
100100 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
101− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
102− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
101+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
102+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
103103
104104in
105105
@@ -107,7 +107,7 @@ in
107107assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
108108
109109stdenv.mkDerivation ({
110− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
110+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
111111
112112 builder = ../builder.sh;
113113
pkgs/development/compilers/gcc/6/default.nix+3−3
@@ -94,8 +94,8 @@ let majorVersion = "6";
9494
9595 /* Cross-gcc settings (build == host != target) */
9696 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
97− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
98− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
97+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
98+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
9999
100100in
101101
@@ -103,7 +103,7 @@ in
103103assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
104104
105105stdenv.mkDerivation ({
106− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
106+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
107107
108108 builder = ../builder.sh;
109109
pkgs/development/compilers/gcc/7/default.nix+3−3
@@ -72,13 +72,13 @@ let majorVersion = "7";
7272
7373 /* Cross-gcc settings (build == host != target) */
7474 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
75− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
76− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
75+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
76+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
7777
7878in
7979
8080stdenv.mkDerivation ({
81− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
81+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
8282
8383 builder = ../builder.sh;
8484
pkgs/development/compilers/gcc/8/default.nix+3−3
@@ -64,13 +64,13 @@ let majorVersion = "8";
6464
6565 /* Cross-gcc settings (build == host != target) */
6666 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
67− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
68− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
67+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
68+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
6969
7070in
7171
7272stdenv.mkDerivation ({
73− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
73+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
7474
7575 builder = ../builder.sh;
7676
pkgs/development/compilers/gcc/9/default.nix+3−3
@@ -63,13 +63,13 @@ let majorVersion = "9";
6363
6464 /* Cross-gcc settings (build == host != target) */
6565 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
66− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
67− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
66+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
67+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
6868
6969in
7070
7171stdenv.mkDerivation ({
72− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
72+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
7373
7474 builder = ../builder.sh;
7575
pkgs/development/compilers/gcc/snapshot/default.nix+3−3
@@ -60,13 +60,13 @@ let majorVersion = "7";
6060
6161 /* Cross-gcc settings (build == host != target) */
6262 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
63− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
64− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
63+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
64+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
6565
6666in
6767
6868stdenv.mkDerivation ({
69− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
69+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
7070
7171 builder = ../builder.sh;
7272