Skip to content
Snippets Groups Projects
Commit ed7a462d authored by tromey's avatar tromey
Browse files

* config-ml.in: Handle GCJ and GCJFLAGS.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@40721 138bc75d-0d04-0410-961f-82ee72b054a4
parent c5d1abaa
No related merge requests found
2001-03-19 Tom Tromey <tromey@redhat.com>
* config-ml.in: Handle GCJ and GCJFLAGS.
2001-03-21 Michael Chastain <chastain@redhat.com> 2001-03-21 Michael Chastain <chastain@redhat.com>
* Makefile.in: all-m4 depends on all-texinfo. * Makefile.in: all-m4 depends on all-texinfo.
......
...@@ -526,6 +526,7 @@ multi-do: ...@@ -526,6 +526,7 @@ multi-do:
CFLAGS="$(CFLAGS) $${flags}" \ CFLAGS="$(CFLAGS) $${flags}" \
prefix="$(prefix)" \ prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \ exec_prefix="$(exec_prefix)" \
GCJFLAGS="$(GCJFLAGS) $${flags}" \
CXXFLAGS="$(CXXFLAGS) $${flags}" \ CXXFLAGS="$(CXXFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \ LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \ LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
...@@ -748,11 +749,12 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then ...@@ -748,11 +749,12 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
break break
fi fi
done 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 if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' ' CC_=$CC' '
CXX_=$CXX' ' CXX_=$CXX' '
GCJ_=$GCJ' '
else else
# Create a regular expression that matches any string as long # Create a regular expression that matches any string as long
# as ML_POPDIR. # as ML_POPDIR.
...@@ -781,6 +783,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then ...@@ -781,6 +783,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
esac esac
done 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
if test "x${LD_LIBRARY_PATH+set}" = xset; then if test "x${LD_LIBRARY_PATH+set}" = xset; then
LD_LIBRARY_PATH_= LD_LIBRARY_PATH_=
for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment