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 14:54:44 +0000 |
commit | e9365882c1086c5dae199334038527b579d022a4 (patch) | |
tree | ef9d3ccb4f64b3576a15a71f861efdfc440996da /pkgs/development/compilers/gcc | |
parent | 120499c03ae7fb1e3d9f493efa83f67663740e74 (diff) | |
download | nixpkgs-e9365882c1086c5dae199334038527b579d022a4.tar nixpkgs-e9365882c1086c5dae199334038527b579d022a4.tar.gz nixpkgs-e9365882c1086c5dae199334038527b579d022a4.tar.bz2 nixpkgs-e9365882c1086c5dae199334038527b579d022a4.tar.lz nixpkgs-e9365882c1086c5dae199334038527b579d022a4.tar.xz nixpkgs-e9365882c1086c5dae199334038527b579d022a4.tar.zst nixpkgs-e9365882c1086c5dae199334038527b579d022a4.zip |
gcc46: moving the bootstrap logic into nix
It was in the builder.sh.
Diffstat (limited to 'pkgs/development/compilers/gcc')
-rw-r--r-- | pkgs/development/compilers/gcc/4.6/builder.sh | 9 | ||||
-rw-r--r-- | pkgs/development/compilers/gcc/4.6/default.nix | 10 |
2 files changed, 9 insertions, 10 deletions
diff --git a/pkgs/development/compilers/gcc/4.6/builder.sh b/pkgs/development/compilers/gcc/4.6/builder.sh index 2f655ece170..2bb18541739 100644 --- a/pkgs/development/compilers/gcc/4.6/builder.sh +++ b/pkgs/development/compilers/gcc/4.6/builder.sh @@ -243,13 +243,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.6/default.nix b/pkgs/development/compilers/gcc/4.6/default.nix index ade35c3c2cf..bf2d01b280d 100644 --- a/pkgs/development/compilers/gcc/4.6/default.nix +++ b/pkgs/development/compilers/gcc/4.6/default.nix @@ -156,6 +156,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+. @@ -230,7 +232,7 @@ stdenv.mkDerivation ({ '' else null; - inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic + inherit noSysDirs staticCompiler langJava crossStageStatic libcCross crossMingw; buildNativeInputs = [ texinfo which gettext ] @@ -297,10 +299,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" @@ -350,6 +357,7 @@ stdenv.mkDerivation ({ ${if cross != null then crossConfigureFlags else ""} --target=${stdenv.cross.config} ''; + buildFlags = ""; }; |