This is the mail archive of the
gcc-patches@gcc.gnu.org
mailing list for the GCC project.
Patch: config.ml -vs- Java
- To: Gcc Patch List <gcc-patches at gcc dot gnu dot org>
- Subject: Patch: config.ml -vs- Java
- From: Tom Tromey <tromey at redhat dot com>
- Date: 21 Mar 2001 11:41:32 -0700
- Reply-To: tromey at redhat dot com
This patch lets the Java libraries correctly build when multilibbed.
Without this patch (and some others which I will check in soon), the
Java libraries will not build when using a default (multilibbed)
configuration on PPC Linux.
I've built with this patch on both x86 Linux and PPC Linux.
Ok for branch and trunk?
2001-03-19 Tom Tromey <tromey@redhat.com>
* config-ml.in: Handle GCJ and GCJFLAGS.
Tom
Index: config-ml.in
===================================================================
RCS file: /cvs/gcc/gcc/config-ml.in,v
retrieving revision 1.16.4.1
diff -u -r1.16.4.1 config-ml.in
--- config-ml.in 2001/02/20 01:01:53 1.16.4.1
+++ config-ml.in 2001/03/21 18:31:09
@@ -526,6 +526,7 @@
CFLAGS="$(CFLAGS) $${flags}" \
prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \
+ GCJFLAGS="$(GCJFLAGS) $${flags}" \
CXXFLAGS="$(CXXFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
@@ -748,11 +749,12 @@
break
fi
done
- ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags"'
+ ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" GCJ="${GCJ_}$flags"'
if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' '
CXX_=$CXX' '
+ GCJ_=$GCJ' '
else
# Create a regular expression that matches any string as long
# as ML_POPDIR.
@@ -778,6 +780,18 @@
CXX_="${CXX_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
*)
CXX_="${CXX_}${arg} " ;;
+ esac
+ done
+
+ GCJ_=
+ for arg in ${GCJ}; do
+ case $arg in
+ -[BIL]"${ML_POPDIR}"/*)
+ GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(-[BIL]${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X-[BIL]${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+ "${ML_POPDIR}"/*)
+ GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+ *)
+ GCJ_="${GCJ_}${arg} " ;;
esac
done