diff options
| author | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-07 01:40:22 +0000 |
|---|---|---|
| committer | neroden <neroden@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-04-07 01:40:22 +0000 |
| commit | f4191912d2df9af772c483597aedf38d207e7c9c (patch) | |
| tree | 14911340ebe82332452e682e2d90b834b8444d4a | |
| parent | 334c827954b470df6f8c7fb09e8058aede2ad3cf (diff) | |
| download | gcc-f4191912d2df9af772c483597aedf38d207e7c9c.tar.gz | |
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.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@80474 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | configure.in | 30 |
3 files changed, 39 insertions, 30 deletions
diff --git a/ChangeLog b/ChangeLog index e1c580b78c2..0cdd9ec3ba6 100644 --- a/ChangeLog +++ b/ChangeLog @@ -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. diff --git a/configure b/configure index 60686a4dc86..340243354f1 100755 --- a/configure +++ b/configure @@ -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 diff --git a/configure.in b/configure.in index 015e85cbe88..0cce5a94cc1 100644 --- a/configure.in +++ b/configure.in @@ -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 |