Adding a gcc patch I forgot to add in the proper commit, while it is already
referenced in the gcc 4.3 expression. svn path=/nixpkgs/branches/stdenv-updates/; revision=18813
This commit is contained in:
parent
4164de326a
commit
9651069240
@ -12,7 +12,7 @@
|
|||||||
, name ? "gcc"
|
, name ? "gcc"
|
||||||
, cross ? null
|
, cross ? null
|
||||||
, binutilsCross ? null
|
, binutilsCross ? null
|
||||||
, glibcCross ? null
|
, libcCross ? null
|
||||||
, crossStageStatic ? true
|
, crossStageStatic ? true
|
||||||
}:
|
}:
|
||||||
|
|
||||||
@ -36,7 +36,7 @@ let
|
|||||||
" --disable-libgomp " +
|
" --disable-libgomp " +
|
||||||
" --disable-shared"
|
" --disable-shared"
|
||||||
else
|
else
|
||||||
" --with-headers=${glibcCross}/include" +
|
" --with-headers=${libcCross}/include" +
|
||||||
" --enable-__cxa_atexit" +
|
" --enable-__cxa_atexit" +
|
||||||
" --enable-long-long" +
|
" --enable-long-long" +
|
||||||
" --enable-threads=posix" +
|
" --enable-threads=posix" +
|
||||||
@ -78,7 +78,7 @@ stdenv.mkDerivation ({
|
|||||||
++ optional langJava ./java-jvgenmain-link.patch;
|
++ optional langJava ./java-jvgenmain-link.patch;
|
||||||
|
|
||||||
inherit noSysDirs profiledCompiler staticCompiler crossStageStatic
|
inherit noSysDirs profiledCompiler staticCompiler crossStageStatic
|
||||||
binutilsCross glibcCross;
|
binutilsCross libcCross;
|
||||||
targetConfig = if (cross != null) then cross.config else null;
|
targetConfig = if (cross != null) then cross.config else null;
|
||||||
|
|
||||||
buildInputs = [texinfo gmp mpfr]
|
buildInputs = [texinfo gmp mpfr]
|
||||||
|
Loading…
x
Reference in New Issue
Block a user