re PR bootstrap/14760 (A bug in configure{,.in} prevents using both --program-suffix and --program-prefix)

PR bootstrap/14760
	* configure.in: When computing baseargs, strip *all* copies of
	offending options.  Also, don't match/substitute the trailing space,
	so that this actually works when two similar options are separated by
	only one space.
	* configure: Regenerate.

From-SVN: r80474
This commit is contained in:
Nathanael Nerode 2004-04-07 01:40:22 +00:00
parent 615be2cfe6
commit 9104315af8
3 changed files with 39 additions and 30 deletions

View File

@ -1,3 +1,12 @@
2004-04-06 Nathanael Nerode <neroden@gcc.gnu.org>
PR bootstrap/14760
* configure.in: When computing baseargs, strip *all* copies of
offending options. Also, don't match/substitute the trailing space,
so that this actually works when two similar options are separated by
only one space.
* configure: Regenerate.
2004-04-06 David Edelsohn <edelsohn@gnu.org>
* configure.in (powerpc-*-aix*): Remove target-libada from noconfigdirs.

30
configure vendored
View File

@ -2939,21 +2939,21 @@ serialization_dependencies=serdep.tmp
# at the end of the argument list.
# These will be expanded by make, so quote '$'.
cat <<\EOF_SED > conftestsed
s/ --no[^ ]* / /
s/ --c[a-z-]*[= ][^ ]* / /
s/ --sr[a-z-]*[= ][^ ]* / /
s/ --ho[a-z-]*[= ][^ ]* / /
s/ --bu[a-z-]*[= ][^ ]* / /
s/ --t[a-z-]*[= ][^ ]* / /
s/ --program-[pst][a-z-]*[= ][^ ]* / /
s/ -cache-file[= ][^ ]* / /
s/ -srcdir[= ][^ ]* / /
s/ -host[= ][^ ]* / /
s/ -build[= ][^ ]* / /
s/ -target[= ][^ ]* / /
s/ -program-prefix[= ][^ ]* / /
s/ -program-suffix[= ][^ ]* / /
s/ -program-transform-name[= ][^ ]* / /
s/ --no[^ ]*/ /g
s/ --c[a-z-]*[= ][^ ]*//g
s/ --sr[a-z-]*[= ][^ ]*//g
s/ --ho[a-z-]*[= ][^ ]*//g
s/ --bu[a-z-]*[= ][^ ]*//g
s/ --t[a-z-]*[= ][^ ]*//g
s/ --program-[pst][a-z-]*[= ][^ ]*//g
s/ -cache-file[= ][^ ]*//g
s/ -srcdir[= ][^ ]*//g
s/ -host[= ][^ ]*//g
s/ -build[= ][^ ]*//g
s/ -target[= ][^ ]*//g
s/ -program-prefix[= ][^ ]*//g
s/ -program-suffix[= ][^ ]*//g
s/ -program-transform-name[= ][^ ]*//g
s/ [^' -][^ ]* / /
s/^ *//;s/ *$//
s,\$,$$,g

View File

@ -1733,21 +1733,21 @@ AC_SUBST_FILE(serialization_dependencies)
# at the end of the argument list.
# These will be expanded by make, so quote '$'.
cat <<\EOF_SED > conftestsed
s/ --no[[^ ]]* / /
s/ --c[[a-z-]]*[[= ]][[^ ]]* / /
s/ --sr[[a-z-]]*[[= ]][[^ ]]* / /
s/ --ho[[a-z-]]*[[= ]][[^ ]]* / /
s/ --bu[[a-z-]]*[[= ]][[^ ]]* / /
s/ --t[[a-z-]]*[[= ]][[^ ]]* / /
s/ --program-[[pst]][[a-z-]]*[[= ]][[^ ]]* / /
s/ -cache-file[[= ]][[^ ]]* / /
s/ -srcdir[[= ]][[^ ]]* / /
s/ -host[[= ]][[^ ]]* / /
s/ -build[[= ]][[^ ]]* / /
s/ -target[[= ]][[^ ]]* / /
s/ -program-prefix[[= ]][[^ ]]* / /
s/ -program-suffix[[= ]][[^ ]]* / /
s/ -program-transform-name[[= ]][[^ ]]* / /
s/ --no[[^ ]]*/ /g
s/ --c[[a-z-]]*[[= ]][[^ ]]*//g
s/ --sr[[a-z-]]*[[= ]][[^ ]]*//g
s/ --ho[[a-z-]]*[[= ]][[^ ]]*//g
s/ --bu[[a-z-]]*[[= ]][[^ ]]*//g
s/ --t[[a-z-]]*[[= ]][[^ ]]*//g
s/ --program-[[pst]][[a-z-]]*[[= ]][[^ ]]*//g
s/ -cache-file[[= ]][[^ ]]*//g
s/ -srcdir[[= ]][[^ ]]*//g
s/ -host[[= ]][[^ ]]*//g
s/ -build[[= ]][[^ ]]*//g
s/ -target[[= ]][[^ ]]*//g
s/ -program-prefix[[= ]][[^ ]]*//g
s/ -program-suffix[[= ]][[^ ]]*//g
s/ -program-transform-name[[= ]][[^ ]]*//g
s/ [[^' -][^ ]*] / /
s/^ *//;s/ *$//
s,\$,$$,g