blob: b664e9cd0cdbebdeb2691f3ca2d5bb97550fa445 (
plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
|
# DP: - Link ecjx with -rpath $(dbexecdir)
---
libjava/Makefile.am | 2 +-
libjava/Makefile.in | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
--- a/src/libjava/Makefile.am
+++ b/src/libjava/Makefile.am
@@ -888,7 +888,7 @@ else !ENABLE_SHARED
ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR) -fbootclasspath=$(BOOTCLASSPATH)
endif !ENABLE_SHARED
-ecjx_LDADD = -L$(here)/.libs $(extra_ldflags)
+ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) -rpath $(dbexecdir)
ecjx_DEPENDENCIES = libgcj.la libgcj.spec
if USE_LIBGCJ_BC
ecjx_DEPENDENCIES += libgcj_bc.la
--- a/src/libjava/Makefile.in
+++ b/src/libjava/Makefile.in
@@ -8360,7 +8360,7 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
@NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
@NATIVE_FALSE@ecjx_LDADD =
@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \
-@NATIVE_TRUE@ $(am__append_21)
+@NATIVE_TRUE@ $(am__append_21) -rpath $(dbexecdir)
@NATIVE_FALSE@ecjx_DEPENDENCIES =
@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
@NATIVE_TRUE@ $(am__append_20)
|
