diff --git a/pkgs/development/compilers/gcc-4.3/default.nix b/pkgs/development/compilers/gcc-4.3/default.nix index a7c3c21fb51b..aad9f8207446 100644 --- a/pkgs/development/compilers/gcc-4.3/default.nix +++ b/pkgs/development/compilers/gcc-4.3/default.nix @@ -43,7 +43,8 @@ stdenv.mkDerivation ({ patches = [./pass-cxxcpp.patch] ++ optional noSysDirs ./no-sys-dirs.patch - ++ optional (noSysDirs && langFortran) ./no-sys-dirs-fortran.patch; + ++ optional (noSysDirs && langFortran) ./no-sys-dirs-fortran.patch + ++ optional langJava ./java-jvgenmain-link.patch; inherit noSysDirs profiledCompiler staticCompiler; diff --git a/pkgs/development/compilers/gcc-4.3/java-jvgenmain-link.patch b/pkgs/development/compilers/gcc-4.3/java-jvgenmain-link.patch new file mode 100644 index 000000000000..5e963894c34a --- /dev/null +++ b/pkgs/development/compilers/gcc-4.3/java-jvgenmain-link.patch @@ -0,0 +1,14 @@ +The `jvgenmain' executable must be linked against `vec.o', among others, +since it uses its vector API. + +--- gcc-4.3.3/gcc/java/Make-lang.in 2008-12-05 00:00:19.000000000 +0100 ++++ gcc-4.3.3/gcc/java/Make-lang.in 2009-07-03 15:22:29.000000000 +0200 +@@ -109,7 +109,7 @@ jcf-dump$(exeext): $(JCFDUMP_OBJS) $(LIB + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JCFDUMP_OBJS) \ + $(CPPLIBS) $(ZLIB) $(LDEXP_LIB) $(LIBS) + +-jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) ++jvgenmain$(exeext): $(JVGENMAIN_OBJS) $(LIBDEPS) $(BUILD_RTL) + rm -f $@ + $(CC) $(ALL_CFLAGS) $(LDFLAGS) -o $@ $(JVGENMAIN_OBJS) $(LIBS) +