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

---
 libjava/Makefile.am |    2 +-
 libjava/Makefile.in |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index c4746bf..c49c90a 100644
--- a/libjava/Makefile.am
+++ b/libjava/Makefile.am
@@ -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 --git a/libjava/Makefile.in b/libjava/Makefile.in
index 4de0b31..8921b08 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -934,7 +934,7 @@ bin_SCRIPTS = contrib/rebuild-gcj-db contrib/aot-compile \
 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) \
-- 
1.6.2.4