mirror of
https://github.com/ilyakooo0/nixpkgs.git
synced 2024-09-21 20:49:52 +03:00
gcc47: moving the bootstrap logic into nix
It was in the builder.sh. Similar to the previous patch to gcc46.
This commit is contained in:
parent
f94f53a54e
commit
636303797f
@ -237,13 +237,4 @@ postInstall() {
|
|||||||
eval "$postInstallGhdl"
|
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
|
genericBuild
|
||||||
|
@ -151,6 +151,8 @@ let version = "4.7.2";
|
|||||||
"-stage-final";
|
"-stage-final";
|
||||||
crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else "";
|
crossNameAddon = if (cross != null) then "-${cross.config}" + stageNameAddon else "";
|
||||||
|
|
||||||
|
bootstrap = cross == null && !stdenv.isArm && !stdenv.isMips;
|
||||||
|
|
||||||
in
|
in
|
||||||
|
|
||||||
# We need all these X libraries when building AWT with GTK+.
|
# We need all these X libraries when building AWT with GTK+.
|
||||||
@ -222,7 +224,7 @@ stdenv.mkDerivation ({
|
|||||||
''
|
''
|
||||||
else null;
|
else null;
|
||||||
|
|
||||||
inherit noSysDirs profiledCompiler staticCompiler langJava crossStageStatic
|
inherit noSysDirs staticCompiler langJava crossStageStatic
|
||||||
libcCross crossMingw;
|
libcCross crossMingw;
|
||||||
|
|
||||||
buildNativeInputs = [ texinfo which gettext ]
|
buildNativeInputs = [ texinfo which gettext ]
|
||||||
@ -296,10 +298,15 @@ stdenv.mkDerivation ({
|
|||||||
${if langAda then " --enable-libada" else ""}
|
${if langAda then " --enable-libada" else ""}
|
||||||
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
|
${if (cross == null && stdenv.isi686) then "--with-arch=i686" else ""}
|
||||||
${if cross != null then crossConfigureFlags else ""}
|
${if cross != null then crossConfigureFlags else ""}
|
||||||
|
${if !bootstrap then "--disable-bootstrap" else ""}
|
||||||
";
|
";
|
||||||
|
|
||||||
targetConfig = if (cross != null) then cross.config else null;
|
targetConfig = if (cross != null) then cross.config else null;
|
||||||
|
|
||||||
|
buildFlags = if bootstrap then
|
||||||
|
(if profiledCompiler then "profiledbootstrap" else "bootstrap")
|
||||||
|
else "";
|
||||||
|
|
||||||
installTargets =
|
installTargets =
|
||||||
if stripped
|
if stripped
|
||||||
then "install-strip"
|
then "install-strip"
|
||||||
@ -348,6 +355,7 @@ stdenv.mkDerivation ({
|
|||||||
${if cross != null then crossConfigureFlags else ""}
|
${if cross != null then crossConfigureFlags else ""}
|
||||||
--target=${stdenv.cross.config}
|
--target=${stdenv.cross.config}
|
||||||
'';
|
'';
|
||||||
|
buildFlags = "";
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user