config-ml.in: Pass FCFLAGS for multilibs, handle GFORTRAN like CC.

        * config-ml.in: Pass FCFLAGS for multilibs, handle GFORTRAN
        like CC.

From-SVN: r90246

diff --git a/ChangeLog b/ChangeLog
index e3296b6351ce33f853a2472556afa38b88aafdff..0bcddd0a85e199c9adceaac2715235623c315df1 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-07  David Edelsohn  <edelsohn@gnu.org>
+
+       * config-ml.in: Pass FCFLAGS for multilibs, handle GFORTRAN
+       like CC.
+
 2004-11-05  Paolo Bonzini  <bonzini@gnu.org>
 
        * Makefile.def (host fixincludes): Specify missing targets.

diff --git a/config-ml.in b/config-ml.in
index 34874ce8bc0b46346e6c42362c8ce9bf09e1e56b..253e8dd04d9fb3ab440c35b47234a441f4725b66 100644 (file)
--- a/config-ml.in
+++ b/config-ml.in
@@ -546,6 +546,7 @@ multi-do:
                flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
                if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
                                CFLAGS="$(CFLAGS) $${flags}" \
+                               FCFLAGS="$(FCFLAGS) $${flags}" \
                                FFLAGS="$(FFLAGS) $${flags}" \
                                ADAFLAGS="$(ADAFLAGS) $${flags}" \
                                prefix="$(prefix)" \
@@ -779,13 +780,14 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
         break
       fi
     done
-    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags"'
+    ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GCJ="${GCJ_}$flags" GFORTRAN="${GFORTRAN_}$flags"'
 
     if [ "${with_target_subdir}" = "." ]; then
        CC_=$CC' '
        CXX_=$CXX' '
        F77_=$F77' '
        GCJ_=$GCJ' '
+       GFORTRAN_=$GFORTRAN' '
     else
        # Create a regular expression that matches any string as long
        # as ML_POPDIR.
@@ -838,6 +840,18 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
          esac
        done
 
+       GFORTRAN_=
+       for arg in ${GFORTRAN}; do
+         case $arg in
+         -[BIL]"${ML_POPDIR}"/*)
+           GFORTRAN_="${GFORTRAN_}"`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}"/*)
+           GFORTRAN_="${GFORTRAN_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
+         *)
+           GFORTRAN_="${GFORTRAN_}${arg} " ;;
+         esac
+       done
+
        if test "x${LD_LIBRARY_PATH+set}" = xset; then
          LD_LIBRARY_PATH_=
          for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do