procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

install.texi: Document --enable-static-libjava.

Browse source 
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.

From-SVN: r176351
This commit is contained in:
Matthias Klose 2011-07-16 08:33:10 +00:00 • committed by Matthias Klose
parent b6c917ff5d
commit a4a2c37d8b
7 changed files with 55 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
ChangeLog
View file

@ -1,3 +1,13 @@
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.
2011-07-15 Jason Merrill <jason@redhat.com>
* Makefile.in (check-c++): Move check-gcc-c++0x after

3
Makefile.def
View file

@ -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; };

4
Makefile.in
View file

@ -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

2
Makefile.tpl
View file

@ -319,6 +319,8 @@ HOST_CLOOGINC = @clooginc@
HOST_LIBELFLIBS = @libelflibs@
HOST_LIBELFINC = @libelfinc@
EXTRA_CONFIGARGS_LIBJAVA = @EXTRA_CONFIGARGS_LIBJAVA@
# ----------------------------------------------
# Programs producing files for the BUILD machine
# ----------------------------------------------

20
configure vendored
View file

@ -667,6 +667,7 @@ CPPFLAGS
LDFLAGS
CFLAGS
CC
EXTRA_CONFIGARGS_LIBJAVA
target_subdir
host_subdir
build_subdir
@ -746,6 +747,7 @@ enable_libquadmath
enable_libquadmath_support
enable_libada
enable_libssp
enable_static_libjava
enable_build_with_cxx
with_mpc
with_mpc_include
@ -1460,6 +1462,8 @@ Optional Features:
disable libquadmath support for Fortran
--enable-libada build libada directory
--enable-libssp build libssp directory
--enable-static-libjava[=ARG]
build static libjava [default=no]
--enable-build-with-cxx build with C++ compiler instead of C compiler
--disable-ppl-version-check
disable check for PPL version
@ -2997,6 +3001,22 @@ no)
;;
esac
# Check whether --enable-static-libjava was given.
if test "${enable_static_libjava+set}" = set; then :
enableval=$enable_static_libjava; ENABLE_STATIC_LIBJAVA=$enableval
else
ENABLE_STATIC_LIBJAVA=no
fi
enable_static_libjava=
if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
enable_static_libjava=yes
fi
if test x$enable_static_libjava != xyes ; then
EXTRA_CONFIGARGS_LIBJAVA=--disable-static
fi
# Disable libmudflap on some systems.
if test x$enable_libmudflap = x ; then

14
configure.ac
View file

@ -443,6 +443,20 @@ no)
;;
esac
AC_ARG_ENABLE(static-libjava,
[AS_HELP_STRING([[--enable-static-libjava[=ARG]]],
[build static libjava @<:@default=no@:>@])],
ENABLE_STATIC_LIBJAVA=$enableval,
ENABLE_STATIC_LIBJAVA=no)
enable_static_libjava=
if test "${ENABLE_STATIC_LIBJAVA}" = "yes" ; then
enable_static_libjava=yes
fi
if test x$enable_static_libjava != xyes ; then
EXTRA_CONFIGARGS_LIBJAVA=--disable-static
fi
AC_SUBST(EXTRA_CONFIGARGS_LIBJAVA)
# Disable libmudflap on some systems.
if test x$enable_libmudflap = x ; then

4
gcc/ChangeLog
View file

@ -1,3 +1,7 @@
2011-07-16 Matthias Klose <doko@ubuntu.com>
* doc/install.texi: Document --enable-static-libjava.
2011-07-15 Richard Henderson <rth@redhat.com>
* bb-reorder.c (find_rarely_executed_basic_blocks_and_crossing_edges):