Sophie

Sophie

distrib > Mandriva > current > i586 > media > contrib-release-src > by-pkgid > 96c201571d5f1ddbc1c78f15a7021865 > files > 19

cross-mipsel-gcc-4.4.0-0.2mnb2.src.rpm

diff -p -up gcc-4.4-20090315/libjava/Makefile.am.libgcj_bc-rpath~ gcc-4.4-20090315/libjava/Makefile.am
--- gcc-4.4-20090315/libjava/Makefile.am.libgcj_bc-rpath~	2009-03-15 22:11:46.393348489 -0400
+++ gcc-4.4-20090315/libjava/Makefile.am	2009-03-15 22:14:34.964448309 -0400
@@ -130,7 +130,7 @@ endif
 
 LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
 GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
-          $(LTLDFLAGS) -o $@
+          $(LTLDFLAGS) -o $@ @ADDITIONAL_RPATH@
 GCJ_FOR_ECJX = @GCJ_FOR_ECJX@
 GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@
 LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \
diff -p -up gcc-4.4-20090315/libjava/Makefile.in.libgcj_bc-rpath~ gcc-4.4-20090315/libjava/Makefile.in
--- gcc-4.4-20090315/libjava/Makefile.in.libgcj_bc-rpath~	2009-03-15 22:11:46.399351559 -0400
+++ gcc-4.4-20090315/libjava/Makefile.in	2009-03-15 22:14:17.449347302 -0400
@@ -934,7 +934,7 @@ bin_SCRIPTS = contrib/rebuild-gcj-db con
 GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated
 LTLDFLAGS = $(shell $(top_srcdir)/../libtool-ldflags $(LDFLAGS))
 GCJLINK = $(LIBTOOL) --tag=GCJ --mode=link $(GCJ) -L$(here) $(JC1FLAGS) \
-          $(LTLDFLAGS) -o $@
+          $(LTLDFLAGS) -o $@ @ADDITIONAL_RPATH@
 
 GCJ_FOR_ECJX_LINK = $(GCJ_FOR_ECJX) -o $@
 LIBLINK = $(LIBTOOL) --tag=CXX --mode=link $(CXX) -L$(here) $(JC1FLAGS) \