diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 15:28:56 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2017-12-29 15:28:56 -0500 |
| commit | bc3a6e260a9fc9924f86c36fc522a996df5d3e26 (patch) | |
| tree | 21f852d980f96e4e89e4402b5bed5e9eea7b4db4 /pkgs/development/compilers/gcc/4.8/default.nix | |
| parent | 5d336d36bb0cb20d8966e9e426f8621629ac6e03 (diff) | |
| parent | 3afe325a3e2f906ba512fb7a2f28f79496711592 (diff) | |
| download | nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.gz nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.bz2 nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.lz nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.xz nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.tar.zst nixlib-bc3a6e260a9fc9924f86c36fc522a996df5d3e26.zip | |
Merge commit '3afe325a3e2f906ba512fb7a2f28f79496711592' into mingw32-w64-fix
Diffstat (limited to 'pkgs/development/compilers/gcc/4.8/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.8/default.nix | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/pkgs/development/compilers/gcc/4.8/default.nix b/pkgs/development/compilers/gcc/4.8/default.nix index b20094249254..fa38ac298553 100644 --- a/pkgs/development/compilers/gcc/4.8/default.nix +++ b/pkgs/development/compilers/gcc/4.8/default.nix @@ -181,7 +181,7 @@ let version = "4.8.5"; stageNameAddon = if crossStageStatic then "-stage-static" else "-stage-final"; crossNameAddon = if targetPlatform != hostPlatform then "-${targetPlatform.config}" + stageNameAddon else ""; - bootstrap = targetPlatform == hostPlatform && !hostPlatform.isArm && !hostPlatform.isMips; + bootstrap = targetPlatform == hostPlatform; in @@ -340,14 +340,6 @@ stdenv.mkDerivation ({ }" ] ++ - # Optional features - optional (isl != null) "--with-isl=${isl}" ++ - optionals (cloog != null) [ - "--with-cloog=${cloog}" - "--disable-cloog-version-check" - "--enable-cloog-backend=isl" - ] ++ - (if enableMultilib then ["--enable-multilib" "--disable-libquadmath"] else ["--disable-multilib"]) ++ @@ -356,6 +348,14 @@ stdenv.mkDerivation ({ then ["--enable-plugin"] else ["--disable-plugin"]) ++ + # Optional features + optional (isl != null) "--with-isl=${isl}" ++ + optionals (cloog != null) [ + "--with-cloog=${cloog}" + "--disable-cloog-version-check" + "--enable-cloog-backend=isl" + ] ++ + # Java options optionals langJava [ "--with-ecj-jar=${javaEcj}" |