projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
* configure.ac: Enable fortran for cris-*-elf and crisv32-*-elf.
[deliverable/binutils-gdb.git]
/
config-ml.in
diff --git
a/config-ml.in
b/config-ml.in
index 865275ce3d87a71697fa1daf0ad9c1bd816fa0a6..9adc9e074c666c32aeadd6b00e826e5c7a423109 100644
(file)
--- a/
config-ml.in
+++ b/
config-ml.in
@@
-1,8
+1,8
@@
# Configure fragment invoked in the post-target section for subdirs
# wanting multilib support.
#
# Configure fragment invoked in the post-target section for subdirs
# wanting multilib support.
#
-# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
-# Free Software Foundation, Inc.
+# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003
, 2004,
+#
2005, 2006, 2007
Free Software Foundation, Inc.
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
#
# This file is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@
-16,8
+16,8
@@
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
#
# You should have received a copy of the GNU General Public License
# along with this program; if not, write to the Free Software
-# Foundation, Inc., 5
9 Temple Place - Suite 330
,
-# Boston, MA 0211
1-1307
, USA.
+# Foundation, Inc., 5
1 Franklin Street, Fifth Floor
,
+# Boston, MA 0211
0-1301
, USA.
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
#
# As a special exception to the GNU General Public License, if you
# distribute this file as part of a program that contains a
@@
-101,14
+101,18
@@
Makefile=${ac_file-Makefile}
ml_config_shell=${CONFIG_SHELL-/bin/sh}
Makefile=${ac_file-Makefile}
ml_config_shell=${CONFIG_SHELL-/bin/sh}
-ml_arguments="${ac_configure_args}"
ml_realsrcdir=${srcdir}
# Scan all the arguments and set all the ones we need.
ml_verbose=--verbose
ml_realsrcdir=${srcdir}
# Scan all the arguments and set all the ones we need.
ml_verbose=--verbose
-for option in ${
ml_argument
s}
+for option in ${
ac_configure_arg
s}
do
do
+ # strip single quotes surrounding individual options
+ case $option in
+ \'*\') eval option=$option ;;
+ esac
+
case $option in
--*) ;;
-*) option=-$option ;;
case $option in
--*) ;;
-*) option=-$option ;;
@@
-133,7
+137,7
@@
do
enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
eval $enableopt="$optarg"
;;
enableopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
eval $enableopt="$optarg"
;;
- --norecursion | --no
*
)
+ --norecursion | --no
-recursion
)
ml_norecursion=yes
;;
--silent | --sil* | --quiet | --q*)
ml_norecursion=yes
;;
--silent | --sil* | --quiet | --q*)
@@
-536,7
+540,7
@@
multi-do:
else \
rootpre=`${PWD_COMMAND}`/; export rootpre; \
srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
else \
rootpre=`${PWD_COMMAND}`/; export rootpre; \
srcrootpre=`cd $(srcdir); ${PWD_COMMAND}`/; export srcrootpre; \
- lib=`echo
$${rootpre}
| sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
+ lib=`echo
"$${rootpre}"
| sed -e 's,^.*/\([^/][^/]*\)/$$,\1,'`; \
compiler="$(CC)"; \
for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
dir=`echo $$i | sed -e 's/;.*$$//'`; \
compiler="$(CC)"; \
for i in `$${compiler} --print-multi-lib 2>/dev/null`; do \
dir=`echo $$i | sed -e 's/;.*$$//'`; \
@@
-547,6
+551,10
@@
multi-do:
flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
CFLAGS="$(CFLAGS) $${flags}" \
flags=`echo $$i | sed -e 's/^[^;]*;//' -e 's/@/ -/g'`; \
if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) \
CFLAGS="$(CFLAGS) $${flags}" \
+ CCASFLAGS="$(CCASFLAGS) $${flags}" \
+ FCFLAGS="$(FCFLAGS) $${flags}" \
+ FFLAGS="$(FFLAGS) $${flags}" \
+ ADAFLAGS="$(ADAFLAGS) $${flags}" \
prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \
GCJFLAGS="$(GCJFLAGS) $${flags}" \
prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \
GCJFLAGS="$(GCJFLAGS) $${flags}" \
@@
-554,7
+562,12
@@
multi-do:
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
LDFLAGS="$(LDFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
LIBCXXFLAGS="$(LIBCXXFLAGS) $${flags}" \
LDFLAGS="$(LDFLAGS) $${flags}" \
+ MULTIFLAGS="$${flags}" \
DESTDIR="$(DESTDIR)" \
DESTDIR="$(DESTDIR)" \
+ INSTALL="$(INSTALL)" \
+ INSTALL_DATA="$(INSTALL_DATA)" \
+ INSTALL_PROGRAM="$(INSTALL_PROGRAM)" \
+ INSTALL_SCRIPT="$(INSTALL_SCRIPT)" \
$(DO)); then \
true; \
else \
$(DO)); then \
true; \
else \
@@
-573,8
+586,13
@@
multi-clean:
true; \
else \
lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
true; \
else \
lib=`${PWD_COMMAND} | sed -e 's,^.*/\([^/][^/]*\)$$,\1,'`; \
- for dir in Makefile $(MULTIDIRS); do \
- if [ -f ../$${dir}/$${lib}/Makefile ]; then \
+ for dir in : $(MULTIDIRS); do \
+ test $$dir != : || continue; \
+EOF
+cat >>Multi.tem <<EOF
+ if [ -f ../\$\${dir}/\$\${lib}/${Makefile} ]; then \\
+EOF
+cat >>Multi.tem <<\EOF
if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
then true; \
else exit 1; \
if (cd ../$${dir}/$${lib}; $(MAKE) $(FLAGS_TO_PASS) $(DO)); \
then true; \
else exit 1; \
@@
-592,7
+610,7
@@
mv Makefile.tem ${Makefile}
fi # ${ml_toplevel_p} = yes
if [ "${ml_verbose}" = --verbose ]; then
fi # ${ml_toplevel_p} = yes
if [ "${ml_verbose}" = --verbose ]; then
- echo "Adding multilib support to
Makefile
in ${ml_realsrcdir}"
+ echo "Adding multilib support to
${Makefile}
in ${ml_realsrcdir}"
if [ "${ml_toplevel_p}" = yes ]; then
echo "multidirs=${multidirs}"
fi
if [ "${ml_toplevel_p}" = yes ]; then
echo "multidirs=${multidirs}"
fi
@@
-683,7
+701,7
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
fi
ml_origdir=`${PWDCMD-pwd}`
fi
ml_origdir=`${PWDCMD-pwd}`
- ml_libdir=`echo
$ml_origdir
| sed -e 's,^.*/,,'`
+ ml_libdir=`echo
"$ml_origdir"
| sed -e 's,^.*/,,'`
# cd to top-level-build-dir/${with_target_subdir}
cd ..
# cd to top-level-build-dir/${with_target_subdir}
cd ..
@@
-719,7
+737,7
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
case ${srcdir} in
".")
case ${srcdir} in
".")
- echo
Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}
+ echo
"Building symlink tree in `${PWDCMD-pwd}`/${ml_dir}/${ml_libdir}"
if [ "${with_target_subdir}" != "." ]; then
ml_unsubdir="../"
else
if [ "${with_target_subdir}" != "." ]; then
ml_unsubdir="../"
else
@@
-727,7
+745,7
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
fi
(cd ${ml_dir}/${ml_libdir};
../${dotdot}${ml_unsubdir}symlink-tree ../${dotdot}${ml_unsubdir}${ml_libdir} "")
fi
(cd ${ml_dir}/${ml_libdir};
../${dotdot}${ml_unsubdir}symlink-tree ../${dotdot}${ml_unsubdir}${ml_libdir} "")
- if [ -f ${ml_dir}/${ml_libdir}/
Makefile
]; then
+ if [ -f ${ml_dir}/${ml_libdir}/
${Makefile}
]; then
if [ x"${MAKE}" = x ]; then
(cd ${ml_dir}/${ml_libdir}; make distclean)
else
if [ x"${MAKE}" = x ]; then
(cd ${ml_dir}/${ml_libdir}; make distclean)
else
@@
-762,7
+780,7
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
cd ${ml_dir}/${ml_libdir}
if [ -f ${ml_newsrcdir}/configure ]; then
cd ${ml_dir}/${ml_libdir}
if [ -f ${ml_newsrcdir}/configure ]; then
- ml_recprog="${ml_newsrcdir}/configure
--cache-file=../config.cache
"
+ ml_recprog="${ml_newsrcdir}/configure"
fi
# find compiler flag corresponding to ${ml_dir}
fi
# find compiler flag corresponding to ${ml_dir}
@@
-773,16
+791,18
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
break
fi
done
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" GFORTRAN="${GFORTRAN
_}$flags"'
if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' '
CXX_=$CXX' '
if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' '
CXX_=$CXX' '
+ F77_=$F77' '
GCJ_=$GCJ' '
GCJ_=$GCJ' '
+ GFORTRAN_=$GFORTRAN' '
else
# Create a regular expression that matches any string as long
# as ML_POPDIR.
else
# Create a regular expression that matches any string as long
# as ML_POPDIR.
- popdir_rx=`echo
${ML_POPDIR}
| sed 's,.,.,g'`
+ popdir_rx=`echo
"${ML_POPDIR}"
| sed 's,.,.,g'`
CC_=
for arg in ${CC}; do
case $arg in
CC_=
for arg in ${CC}; do
case $arg in
@@
-807,6
+827,18
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
esac
done
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
GCJ_=
for arg in ${GCJ}; do
case $arg in
@@
-819,6
+851,18
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
esac
done
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
if test "x${LD_LIBRARY_PATH+set}" = xset; then
LD_LIBRARY_PATH_=
for arg in `echo "$LD_LIBRARY_PATH" | tr ':' ' '`; do
@@
-856,17
+900,17
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \
- ${
ml_arguments
} ${ml_srcdiroption} ; then
+ ${
ac_configure_args} ${ml_config_env
} ${ml_srcdiroption} ; then
true
else
exit 1
fi
true
else
exit 1
fi
- cd
${ML_POPDIR}
+ cd
"${ML_POPDIR}"
done
done
- cd
${ml_origdir}
+ cd
"${ml_origdir}"
fi
fi # ${ml_toplevel_p} = yes
fi
fi # ${ml_toplevel_p} = yes
This page took
0.025791 seconds
and
4
git commands to generate.