diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index 991d4fc883f..65b357d4c7a 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -170,7 +170,7 @@ let version = "4.6.4"; "-stage-final"; 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 diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index e4e38022a6b..41b29400dd8 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -198,7 +198,7 @@ let version = "4.8.5"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; 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 diff --git a/pkgs/development/compilers/gcc/4.9/default.nix b/pkgs/development/compilers/gcc/4.9/default.nix index 01755a74e1e..f758a1e172e 100644 --- a/pkgs/development/compilers/gcc/4.9/default.nix +++ b/pkgs/development/compilers/gcc/4.9/default.nix @@ -202,7 +202,7 @@ let version = "4.9.4"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in diff --git a/pkgs/development/compilers/gcc/5/default.nix b/pkgs/development/compilers/gcc/5/default.nix index f5c69d24d63..0f8a0bbf794 100644 --- a/pkgs/development/compilers/gcc/5/default.nix +++ b/pkgs/development/compilers/gcc/5/default.nix @@ -202,7 +202,7 @@ let version = "5.4.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in diff --git a/pkgs/development/compilers/gcc/6/default.nix b/pkgs/development/compilers/gcc/6/default.nix index 129bde908fa..6a1616154cb 100644 --- a/pkgs/development/compilers/gcc/6/default.nix +++ b/pkgs/development/compilers/gcc/6/default.nix @@ -201,7 +201,7 @@ let version = "6.2.0"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if cross != null then "-${cross.config}" + stageNameAddon else ""; - bootstrap = cross == null && !stdenv.isDarwin; + bootstrap = cross == null; in diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix index 02f5abcb5f4..35bd07a59d2 100644 --- a/pkgs/top-level/all-packages.nix +++ b/pkgs/top-level/all-packages.nix @@ -4572,7 +4572,7 @@ in cross = 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 { @@ -4587,9 +4587,9 @@ in cross = 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 { @@ -4604,7 +4604,7 @@ in cross = 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 { @@ -4619,7 +4619,7 @@ in cross = 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