From e0754ee6391e75a7cea7f32d071faa671d2e85d0 Mon Sep 17 00:00:00 2001
From: aj <aj@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 30 May 2004 21:54:22 +0000
Subject: [PATCH] * config-ml.in: Pass FFLAGS and ADAFLAGS for
multilibs, handle F77 like CC.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@82465 138bc75d-0d04-0410-961f-82ee72b054a4
---
ChangeLog | 6 ++++++
config-ml.in | 19 +++++++++++++++++--
2 files changed, 23 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 1b4a5ad24280..f96b62e5eacd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+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.
+
2004-05-27 Daniel Jacobowitz <dan@debian.org>
* configure.in: Fix sed invocation for GFORTRAN_FOR_TARGET.
diff --git a/config-ml.in b/config-ml.in
index b2e4ea9cf977..34874ce8bc0b 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
--
GitLab