From e9630ace5abd64e92ee891a9abb0ea3f6f2ebba6 Mon Sep 17 00:00:00 2001 From: unknown author <cooker@mandrivalinux.org> Date: Tue, 10 Feb 2009 15:47:48 +0000 Subject: gcc43-custom-libgcj_bc-rpath Rebased to apply cleanly to 4.6.2 Signed-off-by: Thomas Backlund <tmb@mageia.org> --- libjava/Makefile.am | 2 +- libjava/Makefile.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff -Nurp gcc-4.6.2/libjava/Makefile.am gcc-4.6.2-libgcj/libjava/Makefile.am --- gcc-4.6.2/libjava/Makefile.am 2010-08-27 07:27:40.000000000 +0300 +++ gcc-4.6.2-libgcj/libjava/Makefile.am 2011-12-04 01:04:14.120678886 +0200 @@ -334,7 +334,7 @@ endif LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) GCJLINK = $(LIBTOOL) --tag=GCJ $(LIBTOOLFLAGS) --mode=link $(GCJ) -L$(here) \ - $(JC1FLAGS) $(LTLDFLAGS) -o $@ + $(JC1FLAGS) $(LTLDFLAGS) -o $@ @ADDITIONAL_RPATH@ GCJ_FOR_ECJX = @GCJ_FOR_ECJX@ GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@ LIBLINK = $(LIBTOOL) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXX) -L$(here) \ diff -Nurp gcc-4.6.2/libjava/Makefile.in gcc-4.6.2-libgcj/libjava/Makefile.in --- gcc-4.6.2/libjava/Makefile.in 2011-10-26 12:30:24.000000000 +0300 +++ gcc-4.6.2-libgcj/libjava/Makefile.in 2011-12-04 01:04:14.132678987 +0200 @@ -987,7 +987,7 @@ GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 @ANONVERSCRIPT_SUN_TRUE@@ANONVERSCRIPT_TRUE@libgcj_bc_la_version_dep = libgcj_bc.ver-sun LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS)) GCJLINK = $(LIBTOOL) --tag=GCJ $(LIBTOOLFLAGS) --mode=link $(GCJ) -L$(here) \ - $(JC1FLAGS) $(LTLDFLAGS) -o $@ + $(JC1FLAGS) $(LTLDFLAGS) -o $@ @ADDITIONAL_RPATH@ GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@ LIBLINK = $(LIBTOOL) --tag=CXX $(LIBTOOLFLAGS) --mode=link $(CXX) -L$(here) \
