diff options
| author | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-04-07 01:40:22 +0000 |
|---|---|---|
| committer | Nathanael Nerode <neroden@gcc.gnu.org> | 2004-04-07 01:40:22 +0000 |
| commit | 9104315af86a209017083fddd11e8a8da5a350ae (patch) | |
| tree | 14911340ebe82332452e682e2d90b834b8444d4a | |
| parent | 615be2cfe6a8481c343e4afa9156c80640da7dc7 (diff) | |
| download | gcc-9104315af86a209017083fddd11e8a8da5a350ae.zip gcc-9104315af86a209017083fddd11e8a8da5a350ae.tar.gz gcc-9104315af86a209017083fddd11e8a8da5a350ae.tar.bz2 | |
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
| -rw-r--r-- | ChangeLog | 9 | ||||
| -rwxr-xr-x | configure | 30 | ||||
| -rw-r--r-- | configure.in | 30 |
3 files changed, 39 insertions, 30 deletions
@@ -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. @@ -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 015e85c..0cce5a9 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 |