aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatthias Klose <doko@ubuntu.com>2009-01-11 07:36:46 +0000
committerMatthias Klose <doko@gcc.gnu.org>2009-01-11 07:36:46 +0000
commit6f611d522575ffdf119732db14f5fef982b5f3e3 (patch)
tree88c7203e6d1a44d5f15ea75eebaa847e42385eb3
parent5a2971ffa1b83e7f6e7c203755b071d434290cfa (diff)
downloadgcc-6f611d522575ffdf119732db14f5fef982b5f3e3.zip
gcc-6f611d522575ffdf119732db14f5fef982b5f3e3.tar.gz
gcc-6f611d522575ffdf119732db14f5fef982b5f3e3.tar.bz2
Makefile.am (ecjx_LDADD): Add $(extra_ldflags).
2009-01-11 Matthias Klose <doko@ubuntu.com> * Makefile.am (ecjx_LDADD): Add $(extra_ldflags). * Makefile.in: Regenerate. From-SVN: r143261
-rw-r--r--libjava/ChangeLog5
-rw-r--r--libjava/Makefile.am2
-rw-r--r--libjava/Makefile.in3
3 files changed, 8 insertions, 2 deletions
diff --git a/libjava/ChangeLog b/libjava/ChangeLog
index b9a60b0..6d95814 100644
--- a/libjava/ChangeLog
+++ b/libjava/ChangeLog
@@ -1,3 +1,8 @@
+2009-01-11 Matthias Klose <doko@ubuntu.com>
+
+ * Makefile.am (ecjx_LDADD): Add $(extra_ldflags).
+ * Makefile.in: Regenerate.
+
2009-01-06 Andrew John Hughes <gnu_andrew@member.fsf.org>
Import GNU Classpath (libgcj-snapshot-20090102).
diff --git a/libjava/Makefile.am b/libjava/Makefile.am
index d94bb11..1964ec5 100644
--- a/libjava/Makefile.am
+++ b/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
+ecjx_LDADD = -L$(here)/.libs $(extra_ldflags)
ecjx_DEPENDENCIES = libgcj.la libgcj.spec
if USE_LIBGCJ_BC
ecjx_DEPENDENCIES += libgcj_bc.la
diff --git a/libjava/Makefile.in b/libjava/Makefile.in
index 81ac0d3..bc6f16e 100644
--- a/libjava/Makefile.in
+++ b/libjava/Makefile.in
@@ -8355,7 +8355,8 @@ ECJX_BASE_FLAGS = -findirect-dispatch \
@ENABLE_SHARED_TRUE@@NATIVE_TRUE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) -Djava.class.path=$(ECJ_JAR)
@NATIVE_FALSE@ecjx_LDFLAGS = $(ECJX_BASE_FLAGS) $(ECJ_BUILD_JAR)
@NATIVE_FALSE@ecjx_LDADD =
-@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(am__append_21)
+@NATIVE_TRUE@ecjx_LDADD = -L$(here)/.libs $(extra_ldflags) \
+@NATIVE_TRUE@ $(am__append_21)
@NATIVE_FALSE@ecjx_DEPENDENCIES =
@NATIVE_TRUE@ecjx_DEPENDENCIES = libgcj.la libgcj.spec \
@NATIVE_TRUE@ $(am__append_20)