mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-26 12:23:59 +08:00
configure.ac: Revert 2005-03-25's patch.
* configure.ac: Revert 2005-03-25's patch. Propagate MULTIlib settings to sub Makefiles. (GCJH, ZIP): Prefix with top_builddir. * configure: Rebuild. * external/w3c_dom/Makefile.am (MULTIBUILDTOP): Don't override. * external/w3c_dom/Makefile.in: Rebuild. * external/sax/Makefile.am (MULTIBUILDTOP): Don't override. * external/sax/Makefile.in: Rebuild. From-SVN: r97139
This commit is contained in:
Alexandre Oliva
Alexandre Oliva
parent
b982b5f11c
commit
3162d93d24
@ -1,3 +1,14 @@
|
||||
2005-03-28 Alexandre Oliva <aoliva@redhat.com>
|
||||
|
||||
* configure.ac: Revert 2005-03-25's patch. Propagate MULTIlib
|
||||
settings to sub Makefiles.
|
||||
(GCJH, ZIP): Prefix with top_builddir.
|
||||
* configure: Rebuild.
|
||||
* external/w3c_dom/Makefile.am (MULTIBUILDTOP): Don't override.
|
||||
* external/w3c_dom/Makefile.in: Rebuild.
|
||||
* external/sax/Makefile.am (MULTIBUILDTOP): Don't override.
|
||||
* external/sax/Makefile.in: Rebuild.
|
||||
|
||||
2005-03-28 Eric Botcazou <ebotcazou@libertysurf.fr>
|
||||
|
||||
* testsuite/libjava.jni/jni.exp (gcj_jni_invocation_test_one): Add
|
||||
|
||||
15
libjava/configure
vendored
15
libjava/configure
vendored
@ -13275,7 +13275,6 @@ NATIVE=yes
|
||||
# Which gcj do we use?
|
||||
which_gcj=default
|
||||
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
|
||||
built_hostdir="`cd ${builddotdot}/../../${host_subdir} && ${PWDCMD-pwd}`"
|
||||
if test -n "${with_cross_host}"; then
|
||||
# We are being configured with a cross compiler. We can't
|
||||
# use ac_exeext, because that is for the target platform.
|
||||
@ -13314,10 +13313,8 @@ fi
|
||||
case "${which_gcj}" in
|
||||
built)
|
||||
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
|
||||
# GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
||||
GCJH="$built_gcc_dir/gcjh"
|
||||
# ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
||||
ZIP="$built_hostdir/fastjar/fastjar"
|
||||
GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
||||
ZIP='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
||||
;;
|
||||
cross)
|
||||
if test "x${with_newlib}" = "xyes"; then
|
||||
@ -13334,7 +13331,7 @@ case "${which_gcj}" in
|
||||
GCJ="gcj -B`${PWDCMD-pwd}`/"
|
||||
## In this case, gcj is found outside the build tree. However, zip is
|
||||
## found in the build tree.
|
||||
ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
|
||||
ZIP='$(top_builddir)/$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
|
||||
GCJH=gcjh
|
||||
;;
|
||||
esac
|
||||
@ -17575,6 +17572,12 @@ case " $CONFIG_FILES " in
|
||||
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
|
||||
;;
|
||||
esac
|
||||
for ac_multi_file in $CONFIG_FILES; do
|
||||
case $ac_multi_file in
|
||||
*/Makefile)
|
||||
grep "^MULTI[^ ]* =" Makefile >> "$ac_multi_file" ;;
|
||||
esac
|
||||
done
|
||||
;;
|
||||
esac
|
||||
done
|
||||
|
||||
@ -1029,7 +1029,6 @@ NATIVE=yes
|
||||
# Which gcj do we use?
|
||||
which_gcj=default
|
||||
built_gcc_dir="`cd ${builddotdot}/../../${host_subdir}/gcc && ${PWDCMD-pwd}`"
|
||||
built_hostdir="`cd ${builddotdot}/../../${host_subdir} && ${PWDCMD-pwd}`"
|
||||
if test -n "${with_cross_host}"; then
|
||||
# We are being configured with a cross compiler. We can't
|
||||
# use ac_exeext, because that is for the target platform.
|
||||
@ -1068,10 +1067,8 @@ fi
|
||||
case "${which_gcj}" in
|
||||
built)
|
||||
GCJ="$built_gcc_dir/gcj -B`${PWDCMD-pwd}`/ -B$built_gcc_dir/"
|
||||
# GCJH='$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
||||
GCJH="$built_gcc_dir/gcjh"
|
||||
# ZIP='$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
||||
ZIP="$built_hostdir/fastjar/fastjar"
|
||||
GCJH='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/gcc/gcjh'
|
||||
ZIP='$(top_builddir)/$(MULTIBUILDTOP)../../$(host_subdir)/fastjar/fastjar'
|
||||
;;
|
||||
cross)
|
||||
if test "x${with_newlib}" = "xyes"; then
|
||||
@ -1088,7 +1085,7 @@ case "${which_gcj}" in
|
||||
GCJ="gcj -B`${PWDCMD-pwd}`/"
|
||||
## In this case, gcj is found outside the build tree. However, zip is
|
||||
## found in the build tree.
|
||||
ZIP='$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
|
||||
ZIP='$(top_builddir)/$(MULTIBUILDTOP)../$(COMPPATH)/fastjar/fastjar'
|
||||
GCJH=gcjh
|
||||
;;
|
||||
esac
|
||||
@ -1402,6 +1399,12 @@ case " $CONFIG_FILES " in
|
||||
ac_file=Makefile . ${libgcj_basedir}/../config-ml.in
|
||||
;;
|
||||
esac
|
||||
for ac_multi_file in $CONFIG_FILES; do
|
||||
case $ac_multi_file in
|
||||
*/Makefile)
|
||||
grep "^MULTI[[^ ]]* =" Makefile >> "$ac_multi_file" ;;
|
||||
esac
|
||||
done
|
||||
],
|
||||
srcdir=${srcdir}
|
||||
host=${host}
|
||||
|
||||
3
libjava/external/sax/Makefile.am
vendored
3
libjava/external/sax/Makefile.am
vendored
@ -5,9 +5,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
|
||||
# May be used by various substitution variables.
|
||||
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
|
||||
|
||||
## Needed because $(ZIP) is a relative path.
|
||||
MULTIBUILDTOP = ../../
|
||||
|
||||
## The compiler with whatever flags we want for both -c and -C
|
||||
## compiles.
|
||||
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
|
||||
|
||||
1
libjava/external/sax/Makefile.in
vendored
1
libjava/external/sax/Makefile.in
vendored
@ -299,7 +299,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
|
||||
|
||||
# May be used by various substitution variables.
|
||||
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
|
||||
MULTIBUILDTOP = ../../
|
||||
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
|
||||
BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
|
||||
AM_GCJFLAGS = \
|
||||
|
||||
3
libjava/external/w3c_dom/Makefile.am
vendored
3
libjava/external/w3c_dom/Makefile.am
vendored
@ -5,9 +5,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
|
||||
# May be used by various substitution variables.
|
||||
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
|
||||
|
||||
## Needed because $(ZIP) is a relative path.
|
||||
MULTIBUILDTOP = ../../
|
||||
|
||||
## The compiler with whatever flags we want for both -c and -C
|
||||
## compiles.
|
||||
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
|
||||
|
||||
1
libjava/external/w3c_dom/Makefile.in
vendored
1
libjava/external/w3c_dom/Makefile.in
vendored
@ -299,7 +299,6 @@ AUTOMAKE_OPTIONS = foreign subdir-objects
|
||||
|
||||
# May be used by various substitution variables.
|
||||
gcc_version := $(shell cat $(top_srcdir)/../gcc/BASE-VER)
|
||||
MULTIBUILDTOP = ../../
|
||||
GCJ_WITH_FLAGS = $(GCJ) --encoding=UTF-8 -Wno-deprecated -fbootclasspath=$(BOOTCLASSPATH)
|
||||
BOOTCLASSPATH = $(here)'$(CLASSPATH_SEPARATOR)'$(srcdir)'$(CLASSPATH_SEPARATOR)'$(top_srcdir)'$(CLASSPATH_SEPARATOR)'$(top_builddir)
|
||||
AM_GCJFLAGS = \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user