ilyakooo0/nixpkgs
1
0
Fork 0
mirror of https://github.com/ilyakooo0/nixpkgs.git synced 2025-01-01 00:12:39 +03:00
Code Issues Projects Releases Wiki Activity

gcc: --enable-bootstrap on Darwin

Browse Source 
This seems to be working now. ISL needs to be disable for it to build
completely though.
This commit is contained in:
Matthew Bauer 2016-09-01 09:50:30 -05:00
parent 7a6b860e1c
commit 45cd1ea620
No known key found for this signature in database
GPG Key ID: E04D0AD9469141C3
6 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pkgs/development/compilers/gcc/4.6/default.nix
View File

@ -170,7 +170,7 @@ let version = "4.6.4";
"-stage-final"; "-stage-final";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips && !stdenv.isDarwin; bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
in in

2
pkgs/development/compilers/gcc/4.8/default.nix
View File

@ -198,7 +198,7 @@ let version = "4.8.5";
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips && !stdenv.isDarwin; bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
in in

2
pkgs/development/compilers/gcc/4.9/default.nix
View File

@ -202,7 +202,7 @@ let version = "4.9.4";
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
bootstrap = cross == null && !stdenv.isDarwin; bootstrap = cross == null;
in in

2
pkgs/development/compilers/gcc/5/default.nix
View File

@ -202,7 +202,7 @@ let version = "5.4.0";
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
bootstrap = cross == null && !stdenv.isDarwin; bootstrap = cross == null;
in in

2
pkgs/development/compilers/gcc/6/default.nix
View File

@ -201,7 +201,7 @@ let version = "6.2.0";
stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final";
crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else "";
bootstrap = cross == null && !stdenv.isDarwin; bootstrap = cross == null;
in in

10
pkgs/top-level/all-packages.nix
View File

@ -4572,7 +4572,7 @@ in
cross = null; cross = null;
libcCross = if crossSystem != null then libcCross else null; libcCross = if crossSystem != null then libcCross else null;
isl = isl_0_14; isl = if !stdenv.isDarwin then isl_0_14 else null;
})); }));
gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 { gcc49 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/4.9 {
@ -4587,9 +4587,9 @@ in
cross = null; cross = null;
libcCross = if crossSystem != null then libcCross else null; libcCross = if crossSystem != null then libcCross else null;
isl = isl_0_11; isl = if !stdenv.isDarwin then isl_0_11 else null;
cloog = cloog_0_18_0; cloog = if !stdenv.isDarwin then cloog_0_18_0 else null;
})); }));
gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 { gcc5 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/5 {
@ -4604,7 +4604,7 @@ in
cross = null; cross = null;
libcCross = if crossSystem != null then libcCross else null; libcCross = if crossSystem != null then libcCross else null;
isl = isl_0_14; isl = if !stdenv.isDarwin then isl_0_14 else null;
})); }));
gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 { gcc6 = lowPrio (wrapCC (callPackage ../development/compilers/gcc/6 {
@ -4619,7 +4619,7 @@ in
cross = null; cross = null;
libcCross = if crossSystem != null then libcCross else null; libcCross = if crossSystem != null then libcCross else null;
isl = isl_0_14; isl = if !stdenv.isDarwin then isl_0_14 else null;
})); }));
gfortran = if !stdenv.isDarwin then gfortran5 gfortran = if !stdenv.isDarwin then gfortran5