diff options
| author | Jeffrey A Law <law@cygnus.com> | 1998-05-18 00:23:16 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1998-05-17 18:23:16 -0600 |
| commit | b0ccd8de2a7839644b9343a7a77451110947e8c1 (patch) | |
| tree | 6a0de7a439b1ee50ad77858e508b0fb29d954fe4 | |
| parent | 88117d44fdf73af5014673a4c6ef028e5e7486af (diff) | |
| download | gcc-b0ccd8de2a7839644b9343a7a77451110947e8c1.zip gcc-b0ccd8de2a7839644b9343a7a77451110947e8c1.tar.gz gcc-b0ccd8de2a7839644b9343a7a77451110947e8c1.tar.bz2 | |
Makefile.in (BISON): Use bison from the build tree if it exists.
* Makefile.in (BISON): Use bison from the build tree if it exists.
(FLEX): Similarly.
From-SVN: r19825
| -rw-r--r-- | gcc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/Makefile.in | 10 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/Makefile.in | 4 |
4 files changed, 20 insertions, 4 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 831cd54..928622f 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +Mon May 18 01:23:33 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (BISON): Use bison from the build tree if it exists. + (FLEX): Similarly. + Mon May 18 00:08:19 1998 Nick Clifton <nickc@cygnus.com> * gcc.c (SWITCH_CURTAILS_COMPILATION): Definition. diff --git a/gcc/Makefile.in b/gcc/Makefile.in index e368cf4..88b0202 100644 --- a/gcc/Makefile.in +++ b/gcc/Makefile.in @@ -72,9 +72,15 @@ X_CPPFLAGS = T_CPPFLAGS = CC = @CC@ -BISON = bison +# srcdir might be a relative pathname which won't be valid in a subdirectory, +# so we must use objdir/srcdir instead to make it safe. objdir is always +# a full pathname. +BISON = `if [ -f $(objdir)/../bison/bison ] ; then case $(srcdir) in \ + /*) echo $(objdir)/../bison/bison -L $(srcdir)/../bison/ ;; \ + *) echo $(objdir)/../bison/bison -L $(objdir)/$(srcdir)/../bison/ ;; \ + esac else echo bison ; fi` BISONFLAGS = -LEX = flex +LEX = `if [ -f $(objdir)/../flex/flex ] ; then echo $(objdir)/../flex/flex ; else echo flex ; fi` LEXFLAGS = AR = ar AR_FLAGS = rc diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 5f87d3a..7c7c44f 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +Mon May 18 01:24:08 1998 Jeffrey A Law (law@cygnus.com) + + * Makefile.in (BISON): Use bison from the build tree if it exists. + (FLEX): Similarly. + Sun May 17 14:52:08 1998 Martin v. Loewis <loewis@informatik.hu-berlin.de> * typeck.c (type_unknown_p): Return true for TREE_LIST also. diff --git a/gcc/cp/Makefile.in b/gcc/cp/Makefile.in index 61da1ab..6ce5227 100644 --- a/gcc/cp/Makefile.in +++ b/gcc/cp/Makefile.in @@ -55,9 +55,9 @@ X_CPPFLAGS = T_CPPFLAGS = CC = @CC@ -BISON = bison +BBISON = `if [ -f ../../bison/bison ] ; then echo ../../bison/bison -L $(srcdir)/../../bison/ ; else echo bison ; fi` BISONFLAGS = -LEX = flex +LEX = `if [ -f ../../flex/flex ] ; then echo ../../flex/flex ; else echo flex ; fi` LEXFLAGS = AR = ar AR_FLAGS = rc |