From 965106924028a00bff395048748e38e1356d824c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Llu=C3=ADs=20Batlle=20i=20Rossell?= Date: Fri, 4 Dec 2009 18:42:44 +0000 Subject: [PATCH] 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 --- pkgs/development/compilers/gcc-4.3/default.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix index 58c83f091f1..c8f9c2d3875 100644 --- a/pkgs/development/compilers/gcc-4.3/default.nix +++ b/pkgs/development/compilers/gcc-4.3/default.nix @@ -12,7 +12,7 @@ , name ? "gcc" , cross ? null , binutilsCross ? null -, glibcCross ? null +, libcCross ? null , crossStageStatic ? true }: @@ -36,7 +36,7 @@ let " --disable-libgomp " + " --disable-shared" else - " --with-headers=${glibcCross}/include" + + " --with-headers=${libcCross}/include" + " --enable-__cxa_atexit" + " --enable-long-long" + " --enable-threads=posix" + @@ -78,7 +78,7 @@ stdenv.mkDerivation ({ ++ optional langJava ./java-jvgenmain-link.patch; inherit noSysDirs profiledCompiler staticCompiler crossStageStatic - binutilsCross glibcCross; + binutilsCross libcCross; targetConfig = if (cross != null) then cross.config else null; buildInputs = [texinfo gmp mpfr]