diff --git a/libjava/ChangeLog b/libjava/ChangeLog index b9a60b026df..6d958140ce5 100644 --- a/libjava/ChangeLog +++ b/libjava/ChangeLog @@ -1,3 +1,8 @@ +2009-01-11 Matthias Klose + + * Makefile.am (ecjx_LDADD): Add $(extra_ldflags). + * Makefile.in: Regenerate. + 2009-01-06 Andrew John Hughes Import GNU Classpath (libgcj-snapshot-20090102). diff --git a/libjava/Makefile.am b/libjava/Makefile.am index d94bb117be5..1964ec56b20 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 81ac0d38e17..bc6f16ed663 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)