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 14:57:32 +0000 |
commit | d05b33653e6376124f39984a56c92295b8a65e24 (patch) | |
tree | c313b3684a4eeadd066755d2b36401edcdb95e4d /pkgs/development/compilers | |
parent | e9365882c1086c5dae199334038527b579d022a4 (diff) | |
download | nixlib-d05b33653e6376124f39984a56c92295b8a65e24.tar nixlib-d05b33653e6376124f39984a56c92295b8a65e24.tar.gz nixlib-d05b33653e6376124f39984a56c92295b8a65e24.tar.bz2 nixlib-d05b33653e6376124f39984a56c92295b8a65e24.tar.lz nixlib-d05b33653e6376124f39984a56c92295b8a65e24.tar.xz nixlib-d05b33653e6376124f39984a56c92295b8a65e24.tar.zst nixlib-d05b33653e6376124f39984a56c92295b8a65e24.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 b39b3ac827a1..37400fba5bf5 100644 --- a/pkgs/development/compilers/gcc/4.7/builder.sh +++ b/pkgs/development/compilers/gcc/4.7/builder.sh @@ -239,13 +239,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 9eb8f10115ca..028a1680cb63 100644 --- a/pkgs/development/compilers/gcc/4.7/default.nix +++ b/pkgs/development/compilers/gcc/4.7/default.nix @@ -154,6 +154,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+. @@ -225,7 +227,7 @@ stdenv.mkDerivation ({ '' else null; - inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic + inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; buildNativeInputs = [ texinfo which gettext ] @@ -299,10 +301,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" @@ -362,6 +369,7 @@ stdenv.mkDerivation ({ ${xwithAbi} ${xwithFpu} ''; + buildFlags = ""; }; |