summaryrefslogtreecommitdiff
path: root/Makefile.in
diff options
context:
space:
mode:
authordoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2011-07-16 08:33:10 +0000
committerdoko <doko@138bc75d-0d04-0410-961f-82ee72b054a4>2011-07-16 08:33:10 +0000
commitd7e52ac92ed645bd46f17e825fc48044e8e33cf0 (patch)
tree6e066c2cfa4ca80015b011442cf5a920b489b3e5 /Makefile.in
parentcf797b5e23a26039497346da079319716eeadc2b (diff)
downloadgcc-d7e52ac92ed645bd46f17e825fc48044e8e33cf0.tar.gz
gcc/
2011-07-16 Matthias Klose <doko@ubuntu.com> * doc/install.texi: Document --enable-static-libjava. <toplevel> 2011-07-16 Matthias Klose <doko@ubuntu.com> * Makefile.tpl (EXTRA_CONFIGARGS_LIBJAVA): Define. * Makefile.def (target_modules/libjava): Pass $(EXTRA_CONFIGARGS_LIBJAVA). * configure.ac: Pass --disable-static in EXTRA_CONFIGARGS_LIBJAVA, if not configured with --enable-static-libjava. * Makefile.in: Regenerate. * configure: Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@176351 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'Makefile.in')
-rw-r--r--Makefile.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/Makefile.in b/Makefile.in
index 0d40358d209..e80f0483f97 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -316,6 +316,8 @@ HOST_CLOOGINC = @clooginc@
HOST_LIBELFLIBS = @libelflibs@
HOST_LIBELFINC = @libelfinc@
+EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
+
# ----------------------------------------------
# Programs producing files for the BUILD machine
# ----------------------------------------------
@@ -36891,7 +36893,7 @@ configure-target-libjava:
rm -f no-such-file || : ; \
CONFIG_SITE=no-such-file $(SHELL) $${libsrcdir}/configure \
$(TARGET_CONFIGARGS) --build=${build_alias} --host=${target_alias} \
- --target=${target_alias} $${srcdiroption} \
+ --target=${target_alias} $${srcdiroption} $(EXTRA_CONFIGARGS_LIBJAVA) \
|| exit 1
@endif target-libjava