diff options
| author | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-27 14:54:44 +0000 |
|---|---|---|
| committer | Lluís Batlle i Rossell <viric@viric.name> | 2012-12-27 15:08:16 +0000 |
| commit | f94f53a54e514c818243426bed5c03a5777ad82d (patch) | |
| tree | 33808eb03231be413255686bae50d7b880e7ffb3 /pkgs/development/compilers/gcc/4.6/default.nix | |
| parent | e04b17bfbaa4dbd5252d59f727d7d84ffe25f568 (diff) | |
| download | nixlib-f94f53a54e514c818243426bed5c03a5777ad82d.tar nixlib-f94f53a54e514c818243426bed5c03a5777ad82d.tar.gz nixlib-f94f53a54e514c818243426bed5c03a5777ad82d.tar.bz2 nixlib-f94f53a54e514c818243426bed5c03a5777ad82d.tar.lz nixlib-f94f53a54e514c818243426bed5c03a5777ad82d.tar.xz nixlib-f94f53a54e514c818243426bed5c03a5777ad82d.tar.zst nixlib-f94f53a54e514c818243426bed5c03a5777ad82d.zip | |
gcc46: moving the bootstrap logic into nix
It was in the builder.sh.
Diffstat (limited to 'pkgs/development/compilers/gcc/4.6/default.nix')
| -rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 10 |
1 files changed, 9 insertions, 1 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index e27f1a47f9c1..9a15faeaf1db 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -153,6 +153,8 @@ let version = "4.6.3"; "-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+. @@ -227,7 +229,7 @@ stdenv.mkDerivation ({ '' else null; - inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic + inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; buildNativeInputs = [ texinfo which gettext ] @@ -294,10 +296,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" @@ -347,6 +354,7 @@ stdenv.mkDerivation ({ ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; + buildFlags = ""; }; |