From 8bffa3779c3ec8826ca070c2b9f83eb626ee0544 Mon Sep 17 00:00:00 2001 From: nathan Date: Tue, 29 May 2001 15:16:24 +0000 Subject: [PATCH] * configure.in (gcc_version): Remove unrequired \ on ". (Solaris /bin/sed fails on [^\"]). (configargs.h): Likewise. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@42689 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 6 ++++++ gcc/configure | 4 ++-- gcc/configure.in | 4 ++-- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index e48b292..4e18c7d 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,9 @@ +2001-05-29 Nathan Sidwell + + * configure.in (gcc_version): Remove unrequired \ on ". (Solaris + /bin/sed fails on [^\"]). + (configargs.h): Likewise. + 2001-05-29 Hartmut Schirmer * config/sh/sh.h (IDENT_ASM_OP): End with TAB, not LF. diff --git a/gcc/configure b/gcc/configure index 8bcb8c9..d39c73a 100755 --- a/gcc/configure +++ b/gcc/configure @@ -5004,13 +5004,13 @@ if test "${with_gcc_version_trigger+set}" = set; then else gcc_version_trigger=${srcdir}/version.c fi -gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` +gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'` gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` # Compile in configure arguments. if test -f configargs.h ; then # Being re-configured. - gcc_config_arguments=`grep configuration_arguments configargs.h | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` + gcc_config_arguments=`grep configuration_arguments configargs.h | sed -e 's/.*"\([^"]*\)".*/\1/'` gcc_config_arguments="$gcc_config_arguments : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" else gcc_config_arguments="$TOPLEVEL_CONFIGURE_ARGUMENTS" diff --git a/gcc/configure.in b/gcc/configure.in index 2db8388..9924517 100644 --- a/gcc/configure.in +++ b/gcc/configure.in @@ -872,13 +872,13 @@ else gcc_version_trigger=${srcdir}/version.c fi changequote(,)dnl -gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` +gcc_version_full=`grep version_string ${gcc_version_trigger} | sed -e 's/.*"\([^"]*\)".*/\1/'` gcc_version=`echo ${gcc_version_full} | sed -e 's/\([^ ]*\) .*/\1/'` # Compile in configure arguments. if test -f configargs.h ; then # Being re-configured. - gcc_config_arguments=`grep configuration_arguments configargs.h | sed -e 's/.*\"\([^\"]*\)\".*/\1/'` + gcc_config_arguments=`grep configuration_arguments configargs.h | sed -e 's/.*"\([^"]*\)".*/\1/'` gcc_config_arguments="$gcc_config_arguments : (reconfigured) $TOPLEVEL_CONFIGURE_ARGUMENTS" else gcc_config_arguments="$TOPLEVEL_CONFIGURE_ARGUMENTS" -- 2.7.4