From 4f5e65d7ab3714bf65113fbf6a49def8c2c6260a Mon Sep 17 00:00:00 2001
From: ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Wed, 16 Feb 2000 16:22:47 +0000
Subject: * configure (gcc_version): When setting, narrow search to
lines containing `version_string'.
gcc:
* version.c: Include gansidecl.h and version.h.
* version.h: Wrap entire file in macro __GCC_VERSION_H__.
* configure.in (gcc_version): When setting, narrow search to
lines containing `version_string'.
* Makefile.in (mainversion): Likewise.
(GCC_H): New variable.
(gcc.h): Delete target.
(gcc.o, gccspec.o, cppspec.o): Depend on $(GCC_H), not gcc.h.
(version.o): Depend on version.h.
(dbxout.o): Don't depend on gcc.h.
gcc/cp:
* Make-lang.in (g++spec.o): Depend on $(GCC_H), not gcc.h.
gcc/f:
* Make-lang.in (g77spec.o): Depend on $(GCC_H), not gcc.h.
gcc/java:
* Make-lang.in (jvspec.o): Depend on $(GCC_H), not gcc.h.
libf2c:
* configure.in (gcc_version): When setting, narrow search to
lines containing `version_string'.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@32009 138bc75d-0d04-0410-961f-82ee72b054a4
---
libf2c/configure | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
(limited to 'libf2c/configure')
diff --git a/libf2c/configure b/libf2c/configure
index a1823685fe7..3b445f62a77 100755
--- a/libf2c/configure
+++ b/libf2c/configure
@@ -1231,7 +1231,7 @@ test -f libU77/makefile && mv libU77/makefile libU77/makefile.ori
# Get the version trigger filename from the toplevel
if [ "${with_gcc_version_trigger+set}" = set ]; then
gcc_version_trigger=$with_gcc_version_trigger
- gcc_version=`sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/' < ${gcc_version_trigger}`
+ gcc_version=`grep version_string ${gcc_version_trigger} | sed -e 's/.*\"\([^ \"]*\)[ \"].*/\1/'`
else
gcc_version_trigger=
gcc_version=UNKNOWN
--
cgit v1.2.1