MatCat.OpenSource/8sa1-gcc
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

* config-ml.in: Robustify ac_configure_args parsing.

Browse Source 
From-SVN: r211645
This commit is contained in:
Thomas Schwinge 2014-06-13 16:32:29 +02:00 committed by Thomas Schwinge
parent 45b3824db6
commit a10ec8bcac
2 changed files with 38 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ChangeLog
View File

@ -1,5 +1,7 @@
2014-06-13 Thomas Schwinge <thomas@codesourcery.com> 2014-06-13 Thomas Schwinge <thomas@codesourcery.com>
* config-ml.in: Robustify ac_configure_args parsing.
* configure.ac (--enable-linker-plugin-configure-flags) * configure.ac (--enable-linker-plugin-configure-flags)
(--enable-linker-plugin-flags): New flags. (--enable-linker-plugin-flags): New flags.
(configdirs): Conditionally add libiberty-linker-plugin. (configdirs): Conditionally add libiberty-linker-plugin.

64
config-ml.in
View File

@ -2,7 +2,7 @@
# wanting multilib support. # wanting multilib support.
# #
# Copyright (C) 1995, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004, # 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 # 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 # it under the terms of the GNU General Public License as published by
@ -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 scan_arguments ()
for option in ${ac_configure_args} {
do ml_verbose=--verbose
# strip single quotes surrounding individual options for option
case $option in do
\'*\') eval option=$option ;; # Strip single quotes surrounding individual options, that is, remove one
esac # level of shell quoting for these.
case $option in
\'*\') eval option=$option ;;
esac
case $option in case $option in
--*) ;; --*) ;;
-*) option=-$option ;; -*) option=-$option ;;
esac esac
case $option in case $option in
--*=*) --*=*)
optarg=`echo $option | sed -e 's/^[^=]*=//'` optarg=`echo $option | sed -e 's/^[^=]*=//'`
;; ;;
esac esac
case $option in case $option in
--disable-*) --disable-*)
enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'` enableopt=`echo ${option} | sed 's:^--disable-:enable_:;s:-:_:g'`
eval $enableopt=no eval $enableopt=no
;; ;;
--enable-*) --enable-*)
case "$option" in case "$option" in
*=*) ;; *=*) ;;
*) optarg=yes ;; *) optarg=yes ;;
@ -139,32 +142,37 @@ do
# Don't undo its work. # Don't undo its work.
case $enableopt in case $enableopt in
enable_shared | enable_static) ;; 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 case "$option" in
*=*) ;; *=*) ;;
*) optarg=yes ;; *) optarg=yes ;;
esac esac
withopt=`echo ${option} | sed 's:^--::;s:=.*$::;s:-:_:g'` 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'` withopt=`echo ${option} | sed 's:^--::;s:out::;s:-:_:g'`
eval $withopt=no eval $withopt=no
;; ;;
esac esac
done 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. # Only do this if --enable-multilib.
if [ "${enable_multilib}" = yes ]; then if [ "${enable_multilib}" = yes ]; then
@ -860,7 +868,7 @@ if [ -n "${multidirs}" ] && [ -z "${ml_norecursion}" ]; then
if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \ if eval ${ml_config_env} ${ml_config_shell} ${ml_recprog} \
--with-multisubdir=${ml_dir} --with-multisrctop=${multisrctop} \ --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 true
else else
exit 1 exit 1