diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-27 14:57:32 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-27 15:08:17 +0000 |
| commit | 636303797fa55c6c99de11d3c5a6ff3657fe4ecd (patch) | |
| tree | 272d89d3f03004caa9536ab862a2a2645b8c6b81 /pkgs/development/compilers | |
| parent | f94f53a54e514c818243426bed5c03a5777ad82d (diff) | |
| download | nixlib-636303797fa55c6c99de11d3c5a6ff3657fe4ecd.tar nixlib-636303797fa55c6c99de11d3c5a6ff3657fe4ecd.tar.gz nixlib-636303797fa55c6c99de11d3c5a6ff3657fe4ecd.tar.bz2 nixlib-636303797fa55c6c99de11d3c5a6ff3657fe4ecd.tar.lz nixlib-636303797fa55c6c99de11d3c5a6ff3657fe4ecd.tar.xz nixlib-636303797fa55c6c99de11d3c5a6ff3657fe4ecd.tar.zst nixlib-636303797fa55c6c99de11d3c5a6ff3657fe4ecd.zip | |
gcc47: moving the bootstrap logic into nix
It was in the builder.sh. Similar to the previous patch to gcc46.
Diffstat (limited to 'pkgs/development/compilers')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.7/builder.sh | 9 | ||||
| -rw-r--r-- | pkgs/development/compilers/gcc/4.7/default.nix | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/compilers/gcc/4.7/builder.sh b/pkgs/development/compilers/gcc/4.7/builder.sh index 4ae7a1c193b9..a6c855f4e185 100644 --- a/pkgs/development/compilers/gcc/4.7/builder.sh +++ b/pkgs/development/compilers/gcc/4.7/builder.sh @@ -237,13 +237,4 @@ postInstall() { eval "$postInstallGhdl" } - -if test -z "$targetConfig" && test -z "$crossConfig"; then - if test -z "$profiledCompiler"; then - buildFlags="bootstrap $buildFlags" - else - buildFlags="profiledbootstrap $buildFlags" - fi -fi - genericBuild diff --git a/pkgs/development/compilers/gcc/4.7/default.nix b/pkgs/development/compilers/gcc/4.7/default.nix index 60ef44f2a901..438760499502 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -151,6 +151,8 @@ let version = "4.7.2"; "-stage-final"; crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else ""; + bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips; + in # We need all these X libraries when building AWT with GTK+. @@ -222,7 +224,7 @@ stdenv.mkDerivation ({ '' else null; - inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic + inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; buildNativeInputs = [ texinfo which gettext ] @@ -296,10 +298,15 @@ stdenv.mkDerivation ({ ${if langAda then " --enable-libada" else ""} ${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""} ${if cross != null then crossConfigureFlags else ""} + ${if !bootstrap then "--disable-bootstrap" else ""} "; targetConfig = if (cross != null) then cross.config else null; + buildFlags = if bootstrap then + (if profiledCompiler then "profiledbootstrap" else "bootstrap") + else ""; + installTargets = if stripped then "install-strip" @@ -348,6 +355,7 @@ stdenv.mkDerivation ({ ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; + buildFlags = ""; }; |