aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rwxr-xr-xconfigure4
-rw-r--r--configure.in2
-rw-r--r--gdb/ChangeLog4
-rw-r--r--gdb/configure.in2
5 files changed, 17 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index 17966a5..78a8122 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-29 Jason Merrill <jason@casey.cygnus.com>
+
+ * configure.in: -linux-gnu*, not -linux-gnu.
+
2000-03-10 H.J. Lu <hjl@gnu.org>
* Makefile.in (all-gcc): Backed out the last change.
@@ -45,6 +49,11 @@ Thu Feb 24 16:15:56 2000 Andrew Cagney <cagney@b1.cygnus.com>
* config.guess: Guess "cygwin" rather than "cygwin32".
+2000-02-16 Kaveh R. Ghazi <ghazi@caip.rutgers.edu>
+
+ * configure (gcc_version): When setting, narrow search to
+ lines containing `version_string'.
+
2000-01-06 Geoff Keating <geoffk@cygnus.com>
* configure.in: Use mt-aix43 to handle *_TARGET defs,
diff --git a/configure b/configure
index 499925a..c5f0291 100755
--- a/configure
+++ b/configure
@@ -587,12 +587,12 @@ esac
# the gcc version number changes.
if [ "${with_gcc_version_trigger+set}" = set ]; then
gcc_version_trigger="$with_gcc_version_trigger"
- gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${with_gcc_version_trigger}`
+ gcc_version=`grep version_string ${with_gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
else
# If gcc's sources are available, define the trigger file.
if [ -f ${topsrcdir}/gcc/version.c ] ; then
gcc_version_trigger=${topsrcdir}/gcc/version.c
- gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
+ gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
case "$arguments" in
*--with-gcc-version-trigger=$gcc_version_trigger* )
;;
diff --git a/configure.in b/configure.in
index 2cee9b6..ca1b04f 100644
--- a/configure.in
+++ b/configure.in
@@ -329,7 +329,7 @@ case "${target}" in
powerpc-*-netware*)
target_makefile_frag="${target_makefile_frag} config/mt-netware"
;;
- *-*-linux-gnu)
+ *-*-linux-gnu*)
target_makefile_frag="${target_makefile_frag} config/mt-linux"
;;
*-*-aix4.[3456789]* | *-*-aix[56789].*)
diff --git a/gdb/ChangeLog b/gdb/ChangeLog
index 7f67e14..c461c40 100644
--- a/gdb/ChangeLog
+++ b/gdb/ChangeLog
@@ -1,3 +1,7 @@
+2000-03-29 Jason Merrill <jason@casey.cygnus.com>
+
+ * configure.in: -linux-gnu*, not -linux-gnu.
+
Tue Mar 28 18:28:40 2000 Andrew Cagney <cagney@b1.cygnus.com>
* remote.c (remote_threads_extra_info): Replace qfThreadExtraInfo
diff --git a/gdb/configure.in b/gdb/configure.in
index 8e39589..c2c5df6 100644
--- a/gdb/configure.in
+++ b/gdb/configure.in
@@ -810,7 +810,7 @@ if test "${shared}" = "true"; then
;;
*-*-linux*aout*)
;;
- *-*-linux* | *-pc-linux-gnu)
+ *-*-linux* | *-pc-linux-gnu*)
HLDFLAGS='-Wl,-rpath,$(libdir)'
;;
*-*-solaris*)