git.iko.soy/typeable/nixpkgs
on master help sign in
gcc: Fix cross names

There was an issue with the dashes. (taken from commit e158e113a6b74f6cd0e1de9e976b882a03714bf8)

commit62d64297932068b5afa25fb66ed396cd38ef293a authorCraig Hall <ch9871@gmail.com> dateFri 23 Aug 2019, 11:30 (7 years ago) parent069e9fd
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
@@ -101,8 +101,8 @@ let majorVersion = "4";
101101
102102 /* Cross-gcc settings (build == host != target) */
103103 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
104− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
105− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
104+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
105+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
106106
107107in
108108
@@ -110,7 +110,7 @@ in
110110assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
111111
112112stdenv.mkDerivation ({
113− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
113+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
114114
115115 builder = ../builder.sh;
116116
pkgs/development/compilers/gcc/4.9/default.nix+3−3
@@ -106,8 +106,8 @@ let majorVersion = "4";
106106
107107 /* Cross-gcc settings (build == host != target) */
108108 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
109− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
110− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
109+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
110+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
111111
112112in
113113
@@ -115,7 +115,7 @@ in
115115assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
116116
117117stdenv.mkDerivation ({
118− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
118+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
119119
120120 builder = ../builder.sh;
121121
pkgs/development/compilers/gcc/5/default.nix+3−3
@@ -97,8 +97,8 @@ let majorVersion = "5";
9797
9898 /* Cross-gcc settings (build == host != target) */
9999 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
100− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
101− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
100+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
101+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
102102
103103in
104104
@@ -106,7 +106,7 @@ in
106106assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
107107
108108stdenv.mkDerivation ({
109− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
109+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
110110
111111 builder = ../builder.sh;
112112
pkgs/development/compilers/gcc/6/default.nix+3−3
@@ -93,8 +93,8 @@ let majorVersion = "6";
9393
9494 /* Cross-gcc settings (build == host != target) */
9595 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
96− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
97− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
96+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
97+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
9898
9999in
100100
@@ -102,7 +102,7 @@ in
102102assert x11Support -> (filter (x: x == null) ([ gtk2 libart_lgpl ] ++ xlibs)) == [];
103103
104104stdenv.mkDerivation ({
105− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
105+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
106106
107107 builder = ../builder.sh;
108108
pkgs/development/compilers/gcc/7/default.nix+3−3
@@ -71,13 +71,13 @@ let majorVersion = "7";
7171
7272 /* Cross-gcc settings (build == host != target) */
7373 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
74− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
75− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
74+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
75+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
7676
7777in
7878
7979stdenv.mkDerivation ({
80− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
80+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
8181
8282 builder = ../builder.sh;
8383
pkgs/development/compilers/gcc/8/default.nix+3−3
@@ -63,13 +63,13 @@ let majorVersion = "8";
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/9/default.nix+3−3
@@ -62,13 +62,13 @@ let majorVersion = "9";
6262
6363 /* Cross-gcc settings (build == host != target) */
6464 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
65− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
66− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
65+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
66+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
6767
6868in
6969
7070stdenv.mkDerivation ({
71− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
71+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
7272
7373 builder = ../builder.sh;
7474
pkgs/development/compilers/gcc/snapshot/default.nix+3−3
@@ -59,13 +59,13 @@ let majorVersion = "7";
5959
6060 /* Cross-gcc settings (build == host != target) */
6161 crossMingw = targetPlatform != hostPlatform && targetPlatform.libc == "msvcrt";
62− stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
63− crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else "";
62+ stageNameAddon = if crossStageStatic then "stage-static" else "stage-final";
63+ crossNameAddon = optionalString (targetPlatform != hostPlatform) "${targetPlatform.config}-${stageNameAddon}-";
6464
6565in
6666
6767stdenv.mkDerivation ({
68− name = crossNameAddon + "${name}${if stripped then "" else "-debug"}-${version}";
68+ name = "${crossNameAddon}${name}${if stripped then "" else "-debug"}-${version}";
6969
7070 builder = ../builder.sh;
7171