projects
/
deliverable
/
binutils-gdb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Make find_separate_debug_file* return std::string
[deliverable/binutils-gdb.git]
/
config-ml.in
diff --git
a/config-ml.in
b/config-ml.in
index 11983461c28625b58678bbbc95cfaf41a67298d8..47f153350e47e4bd9c7d5615894793c1f065f4ef 100644
(file)
--- a/
config-ml.in
+++ b/
config-ml.in
@@
-2,7
+2,7
@@
# wanting multilib support.
#
# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
# wanting multilib support.
#
# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2010, 2011
Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2010, 2011
, 2014
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
@@
-31,7
+31,7
@@
# user select which libraries s/he really wants.
#
# Subdirectories wishing to use multilib should put the following lines
# user select which libraries s/he really wants.
#
# Subdirectories wishing to use multilib should put the following lines
-# in the "post-target" section of configure.
in
.
+# in the "post-target" section of configure.
ac
.
#
# if [ "${srcdir}" = "." ] ; then
# if [ "${with_target_subdir}" != "." ] ; then
#
# if [ "${srcdir}" = "." ] ; then
# if [ "${with_target_subdir}" != "." ] ; then
@@
-105,31
+105,34
@@
ml_realsrcdir=${srcdir}
# Scan all the arguments and set all the ones we need.
# Scan all the arguments and set all the ones we need.
-ml_verbose=--verbose
-for option in ${ac_configure_args}
-do
- # strip single quotes surrounding individual options
- case $option in
- \'*\') eval option=$option ;;
- esac
-
- case $option in
- --*) ;;
- -*) option=-$option ;;
- esac
-
- case $option in
- --*=*)
+scan_arguments ()
+{
+ ml_verbose=--verbose
+ for option
+ do
+ # Strip single quotes surrounding individual options, that is, remove one
+ # level of shell quoting for these.
+ case $option in
+ \'*\') eval option=$option ;;
+ esac
+
+ case $option in
+ --*) ;;
+ -*) option=-$option ;;
+ esac
+
+ case $option in
+ --*=*)
optarg=`echo $option | sed -e 's/^[^=]*=//'`
;;
optarg=`echo $option | sed -e 's/^[^=]*=//'`
;;
- esac
+
esac
- case $option in
- --disable-*)
+
case $option in
+
--disable-*)
enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
eval $enableopt=no
;;
enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
eval $enableopt=no
;;
- --enable-*)
+
--enable-*)
case "$option" in
*=*) ;;
*) optarg=yes ;;
case "$option" in
*=*) ;;
*) optarg=yes ;;
@@
-139,32
+142,37
@@
do
# Don't undo its work.
case $enableopt in
enable_shared | enable_static) ;;
# Don't undo its work.
case $enableopt in
enable_shared | enable_static) ;;
- *) eval $enableopt=
"$optarg"
;;
+ *) eval $enableopt=
'$optarg'
;;
esac
;;
esac
;;
- --norecursion | --no-recursion)
+
--norecursion | --no-recursion)
ml_norecursion=yes
;;
ml_norecursion=yes
;;
- --silent | --sil* | --quiet | --q*)
+
--silent | --sil* | --quiet | --q*)
ml_verbose=--silent
;;
ml_verbose=--silent
;;
- --verbose | --v | --verb*)
+
--verbose | --v | --verb*)
ml_verbose=--verbose
;;
ml_verbose=--verbose
;;
- --with-*)
+
--with-*)
case "$option" in
*=*) ;;
*) optarg=yes ;;
esac
withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
case "$option" in
*=*) ;;
*) optarg=yes ;;
esac
withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'`
- eval $withopt=
"$optarg"
+ eval $withopt=
'$optarg'
;;
;;
- --without-*)
+
--without-*)
withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
eval $withopt=no
;;
withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
eval $withopt=no
;;
- esac
-done
+ esac
+ done
+}
+# Use eval to properly handle configure arguments such as
+# --enable-foo='--enable-a=1 --enable-b=2 --enable-c=3'.
+eval scan_arguments "${ac_configure_args}"
+unset scan_arguments
# Only do this if --enable-multilib.
if [ "${enable_multilib}" = yes ]; then
# Only do this if --enable-multilib.
if [ "${enable_multilib}" = yes ]; then
@@
-174,8
+182,8
@@
if [ "${enable_multilib}" = yes ]; then
# ${with_multisubdir} tells us we're in the right branch, but we could be
# in a subdir of that.
# ??? The previous version could void this test by separating the process into
# ${with_multisubdir} tells us we're in the right branch, but we could be
# in a subdir of that.
# ??? The previous version could void this test by separating the process into
-# two files: one that only the library's toplevel configure.
in
ran (to
-# configure the multilib subdirs), and another that all configure.
in
's ran to
+# two files: one that only the library's toplevel configure.
ac
ran (to
+# configure the multilib subdirs), and another that all configure.
ac
's ran to
# update the Makefile. It seemed reasonable to collapse all multilib support
# into one file, but it does leave us with having to perform this test.
ml_toplevel_p=no
# update the Makefile. It seemed reasonable to collapse all multilib support
# into one file, but it does leave us with having to perform this test.
ml_toplevel_p=no
@@
-503,7
+511,6
@@
multi-do:
ADAFLAGS="$(ADAFLAGS) $${flags}" \
prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \
ADAFLAGS="$(ADAFLAGS) $${flags}" \
prefix="$(prefix)" \
exec_prefix="$(exec_prefix)" \
- GCJFLAGS="$(GCJFLAGS) $${flags}" \
GOCFLAGS="$(GOCFLAGS) $${flags}" \
CXXFLAGS="$(CXXFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
GOCFLAGS="$(GOCFLAGS) $${flags}" \
CXXFLAGS="$(CXXFLAGS) $${flags}" \
LIBCFLAGS="$(LIBCFLAGS) $${flags}" \
@@
-738,13
+745,12
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
break
fi
done
break
fi
done
- ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" G
CJ="${GCJ_}$flags" G
FORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
+ ml_config_env='CC="${CC_}$flags" CXX="${CXX_}$flags" F77="${F77_}$flags" GFORTRAN="${GFORTRAN_}$flags" GOC="${GOC_}$flags"'
if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' '
CXX_=$CXX' '
F77_=$F77' '
if [ "${with_target_subdir}" = "." ]; then
CC_=$CC' '
CXX_=$CXX' '
F77_=$F77' '
- GCJ_=$GCJ' '
GFORTRAN_=$GFORTRAN' '
GOC_=$GOC' '
else
GFORTRAN_=$GFORTRAN' '
GOC_=$GOC' '
else
@@
-787,18
+793,6
@@
if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
esac
done
esac
done
- GCJ_=
- for arg in ${GCJ}; do
- case $arg in
- -[BIL]"${ML_POPDIR}"/*)
- GCJ_="${GCJ_}"`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}"/*)
- GCJ_="${GCJ_}"`echo "X${arg}" | sed -n "s/X\\(${popdir_rx}\\).*/\\1/p"`/${ml_dir}`echo "X${arg}" | sed -n "s/X${popdir_rx}\\(.*\\)/\\1/p"`' ' ;;
- *)
- GCJ_="${GCJ_}${arg} " ;;
- esac
- done
-
GFORTRAN_=
for arg in ${GFORTRAN}; do
case $arg in
GFORTRAN_=
for arg in ${GFORTRAN}; do
case $arg in
@@
-860,7
+854,7
@@
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} \
-
${ac_configure_args}
${ml_config_env} ${ml_srcdiroption} ; then
+
"${ac_configure_args}"
${ml_config_env} ${ml_srcdiroption} ; then
true
else
exit 1
true
else
exit 1
This page took
0.026347 seconds
and
4
git commands to generate.