diff options
| author | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-16 16:22:47 +0000 |
|---|---|---|
| committer | ghazi <ghazi@138bc75d-0d04-0410-961f-82ee72b054a4> | 2000-02-16 16:22:47 +0000 |
| commit | 4f5e65d7ab3714bf65113fbf6a49def8c2c6260a (patch) | |
| tree | e12032b14ee1e30a589d857d459c5adb1a7b32b8 /libf2c | |
| parent | 3f5cce54ec5bedc52923c49c72d146fda06120de (diff) | |
| download | gcc-4f5e65d7ab3714bf65113fbf6a49def8c2c6260a.tar.gz | |
* 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
Diffstat (limited to 'libf2c')
| -rw-r--r-- | libf2c/ChangeLog | 5 | ||||
| -rwxr-xr-x | libf2c/configure | 2 | ||||
| -rw-r--r-- | libf2c/configure.in | 2 |
3 files changed, 7 insertions, 2 deletions
diff --git a/libf2c/ChangeLog b/libf2c/ChangeLog index 7ccc621e0e2..e995be3990c 100644 --- a/libf2c/ChangeLog +++ b/libf2c/ChangeLog @@ -1,3 +1,8 @@ +Wed Feb 16 11:10:05 2000 Kaveh R. Ghazi <ghazi@caip.rutgers.edu> + + * configure.in (gcc_version): When setting, narrow search to + lines containing `version_string'. + Tue Nov 16 20:39:42 1999 Geoffrey Keating <geoffk@cygnus.com> * libU77/u77-test.f (wd): Allow for longer working directory 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 diff --git a/libf2c/configure.in b/libf2c/configure.in index a4c502c2424..6d18744034d 100644 --- a/libf2c/configure.in +++ b/libf2c/configure.in @@ -202,7 +202,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 |