diff options
| author | David Edelsohn <dje.gcc@gmail.com> | 2004-11-08 15:28:01 +0000 |
|---|---|---|
| committer | David Edelsohn <dje.gcc@gmail.com> | 2004-11-08 15:28:01 +0000 |
| commit | c37653e73fc56d38bbf6cea3232165e1081339c1 (patch) | |
| tree | cdce6b44358776e2f24565df05c9feadc1453c6a /config-ml.in | |
| parent | aea44f629082dce28d0330e7eb496133426bdff6 (diff) | |
| download | gdb-c37653e73fc56d38bbf6cea3232165e1081339c1.zip gdb-c37653e73fc56d38bbf6cea3232165e1081339c1.tar.gz gdb-c37653e73fc56d38bbf6cea3232165e1081339c1.tar.bz2 | |
* config-ml.in: Pass FCFLAGS for multilibs, handle GFORTRAN
like CC.
Diffstat (limited to 'config-ml.in')
| -rw-r--r-- | config-ml.in | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/config-ml.in b/config-ml.in index 34874ce..253e8dd 100644 --- 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 |