diff options
author | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-16 08:33:10 +0000 |
---|---|---|
committer | doko <doko@138bc75d-0d04-0410-961f-82ee72b054a4> | 2011-07-16 08:33:10 +0000 |
commit | d7e52ac92ed645bd46f17e825fc48044e8e33cf0 (patch) | |
tree | 6e066c2cfa4ca80015b011442cf5a920b489b3e5 /Makefile.def | |
parent | cf797b5e23a26039497346da079319716eeadc2b (diff) | |
download | gcc-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.def')
-rw-r--r-- | Makefile.def | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/Makefile.def b/Makefile.def index b4a8464c5f8..0cc6ef6cade 100644 --- a/Makefile.def +++ b/Makefile.def @@ -132,7 +132,8 @@ target_modules = { module= libtermcap; no_check=true; target_modules = { module= winsup; }; target_modules = { module= libgloss; no_check=true; }; target_modules = { module= libffi; }; -target_modules = { module= libjava; raw_cxx=true; }; +target_modules = { module= libjava; raw_cxx=true; + extra_configure_flags="$(EXTRA_CONFIGARGS_LIBJAVA)"; }; target_modules = { module= zlib; }; target_modules = { module= boehm-gc; }; target_modules = { module= rda; }; |