diff options
| author | Paolo Bonzini <bonzini@gnu.org> | 2004-06-01 07:46:01 +0000 |
|---|---|---|
| committer | Paolo Bonzini <bonzini@gnu.org> | 2004-06-01 07:46:01 +0000 |
| commit | f7a4c34ff9f6255ad3afdd1fdb7ab6a5e758b7c4 (patch) | |
| tree | 2cda772f648a7f32f175afad27eb2ee3f2b3670d /config-ml.in | |
| parent | 319cab08aa1795ea1f22a1990b594abf6d17f05a (diff) | |
2004-06-01 Paolo Bonzini <bonzini@gnu.org>
Merge this patch from the gcc tree:
2004-05-30 Andreas Jaeger <aj@suse.de>
Jim Wilson <wilson@specifixinc.com>
* config-ml.in: Pass FFLAGS and ADAFLAGS for multilibs, handle F77
like CC.
Diffstat (limited to 'config-ml.in')
| -rw-r--r-- | config-ml.in | 19 |
1 files changed, 17 insertions, 2 deletions
diff --git a/config-ml.in b/config-ml.in index b2e4ea9cf9..34874ce8bc 100644 --- a/config-ml.in +++ b/config-ml.in @@ -1,7 +1,7 @@ # Configure fragment invoked in the post-target section for subdirs # wanting multilib support. # -# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003 +# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004 # Free Software Foundation, Inc. # # This file is free software; you can redistribute it and/or modify @@ -546,6 +546,8 @@ multi-do: flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \ if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \ CFLAGS="$(CFLAGS) $${flags}" \ + FFLAGS="$(FFLAGS) $${flags}" \ + ADAFLAGS="$(ADAFLAGS) $${flags}" \ prefix="$(prefix)" \ exec_prefix="$(exec_prefix)" \ GCJFLAGS="$(GCJFLAGS) $${flags}" \ @@ -777,11 +779,12 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then break fi done - ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" GCJ="${GCJ_}$flags"' + ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags"' if [ "${with_target_subdir}" = "." ]; then CC_=$CC' ' CXX_=$CXX' ' + F77_=$F77' ' GCJ_=$GCJ' ' else # Create a regular expression that matches any string as long @@ -811,6 +814,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then esac done + F77_= + for arg in ${F77}; do + case $arg in + -[BIL]"${ML_POPDIR}"/*) + F77_="${F77_}"`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}"/*) + F77_="${F77_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;; + *) + F77_="${F77_}${arg} " ;; + esac + done + GCJ_= for arg in ${GCJ}; do case $arg in |