diff options
| author | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-10-01 21:35:22 +0000 |
|---|---|---|
| committer | law <law@138bc75d-0d04-0410-961f-82ee72b054a4> | 1998-10-01 21:35:22 +0000 |
| commit | 7ca6de5f0e60cba02c85695f9b1e60ccb8085ce0 (patch) | |
| tree | 1a995daa9e2c34a86968fad4207fcd43e8edd2be /libobjc | |
| parent | 3e0562870dbda8443054c1df7ec6ee24ac8b73fd (diff) | |
| download | gcc-7ca6de5f0e60cba02c85695f9b1e60ccb8085ce0.tar.gz | |
* Makefile.in (INCLUDES): Reference gcc via $MULTIBUILDTOP.
(FLAGS_TO_PASS): Added.
(runtime-info.h): Reference cc1ibj via $MULTIBUILDTOP.
* archive.c: Change config.h to tconfig.h.
* configure.in: Find gcc's object directory even for multilibs.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@22725 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 13 | ||||
| -rw-r--r-- | libobjc/Makefile.in | 22 | ||||
| -rw-r--r-- | libobjc/archive.c | 2 | ||||
| -rwxr-xr-x | libobjc/configure | 13 | ||||
| -rw-r--r-- | libobjc/configure.in | 11 |
5 files changed, 52 insertions, 9 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 5eb758e1255..4ed61d9e369 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,4 +1,15 @@ -Wed Sep 30 18:17:17 1998 Robert Lipe <robertl@dgii.com +Thu Oct 1 22:33:03 1998 Robert Lipe <robertl@dgii.com> + Jeffrey A Law (law@cygnus.com) + + * Makefile.in (INCLUDES): Reference gcc via $MULTIBUILDTOP. + (FLAGS_TO_PASS): Added. + (runtime-info.h): Reference cc1ibj via $MULTIBUILDTOP. + + * archive.c: Change config.h to tconfig.h. + + * configure.in: Find gcc's object directory even for multilibs. + +Wed Sep 30 18:17:17 1998 Robert Lipe <robertl@dgii.com> * configure.in: Escape ^ in grep string. * configure: Rebuilt. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index d8c7d14a2bf..67536dccbb2 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -61,7 +61,7 @@ CC = @CC@ CFLAGS = @CFLAGS@ ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) -INCLUDES = -I$(srcdir)/objc -I$(srcdir)/../gcc/config -I../../gcc +INCLUDES = -I$(srcdir)/objc -I$(srcdir)/../gcc/config -I$(MULTIBUILDTOP)../../gcc OBJC_GCFLAGS=-DOBJC_WITH_GC=1 OBJC_THREAD_FILE=thr-@OBJC_THREAD_FILE@ @@ -75,6 +75,24 @@ OBJC_THREAD_FILE=thr-@OBJC_THREAD_FILE@ .m.o: $(CC) -c $(ALL_CFLAGS) $(INCLUDES) $< +# Flags to pass to a recursive make. +FLAGS_TO_PASS = \ + "AR=$(AR)" \ + "AR_FLAGS=$(AR_FLAGS)" \ + "CC=$(CC)" \ + "CFLAGS=$(CFLAGS)" \ + "LIBCFLAGS=$(LIBCFLAGS)" \ + "EXTRA_OFILES=$(EXTRA_OFILES)" \ + "HDEFINES=$(HDEFINES)" \ + "INSTALL=$(INSTALL)" \ + "INSTALL_DATA=$(INSTALL_DATA)" \ + "INSTALL_PROGRAM=$(INSTALL_PROGRAM)" \ + "LDFLAGS=$(LDFLAGS)" \ + "LOADLIBES=$(LOADLIBES)" \ + "PICFLAG=$(PICFLAG)" \ + "RANLIB=$(RANLIB)" \ + "SHELL=$(SHELL)" + all: libobjc.a @OBJC_BOEHM_GC@ $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all @@ -97,7 +115,7 @@ OBJS_GC = archive_gc.o class_gc.o encoding_gc.o gc_gc.o hash_gc.o \ sarray_gc.o selector_gc.o sendmsg_gc.o thr_gc.o \ $(OBJC_THREAD_FILE)_gc.o -runtime-info.h: ../../gcc/cc1obj +runtime-info.h: $(MULTIBUILDTOP)../../gcc/cc1obj echo "" > tmp-runtime echo "/* This file is automatically generated */" > $@ $< -print-objc-runtime-info tmp-runtime >> $@ diff --git a/libobjc/archive.c b/libobjc/archive.c index c762fe6186e..626f6bafea3 100644 --- a/libobjc/archive.c +++ b/libobjc/archive.c @@ -24,7 +24,7 @@ Boston, MA 02111-1307, USA. */ however invalidate any other reasons why the executable file might be covered by the GNU General Public License. */ -#include "config.h" +#include "tconfig.h" #include "runtime.h" #include "typedstream.h" #include "encoding.h" diff --git a/libobjc/configure b/libobjc/configure index 25cdc01509d..a7e2dcefba1 100755 --- a/libobjc/configure +++ b/libobjc/configure @@ -1033,14 +1033,21 @@ fi # Determine the name of the GCC thread file. +dir=`pwd` +if test x"${with_multisubdir}" = "x" ; then + gccobjdir=`echo $dir/../../gcc` +else + gccobjdir=`echo $dir | sed -e s:${with_multisubdir}::`/../../gcc +fi + echo $ac_n "checking for thread file""... $ac_c" 1>&6 -echo "configure:1038: checking for thread file" >&5 +echo "configure:1045: checking for thread file" >&5 if eval "test \"`echo '$''{'objc_cv_thread_file'+set}'`\" = set"; then echo $ac_n "(cached) $ac_c" 1>&6 else - if test -f ../../gcc/Makefile + if test -f $gccobjdir/Makefile then - objc_cv_thread_file=`grep \^GCC_THREAD_FILE ../../gcc/Makefile | awk -F= '{ print $2 }'` + objc_cv_thread_file=`grep \^GCC_THREAD_FILE $gccobjdir/Makefile | awk -F= '{ print $2 }'` else { echo "configure: error: not found" 1>&2; exit 1; } fi diff --git a/libobjc/configure.in b/libobjc/configure.in index a0c40599914..8035f2ad6f7 100644 --- a/libobjc/configure.in +++ b/libobjc/configure.in @@ -61,10 +61,17 @@ AC_HEADER_STDC # Determine the name of the GCC thread file. +dir=`pwd` +if test x"${with_multisubdir}" = "x" ; then + gccobjdir=`echo $dir/../../gcc` +else + gccobjdir=`echo $dir | sed -e s:${with_multisubdir}::`/../../gcc +fi + AC_CACHE_CHECK([for thread file],objc_cv_thread_file, -[if test -f ../../gcc/Makefile +[if test -f $gccobjdir/Makefile then - objc_cv_thread_file=`grep \^GCC_THREAD_FILE ../../gcc/Makefile | awk -F= '{ print $2 }'` + objc_cv_thread_file=`grep \^GCC_THREAD_FILE $gccobjdir/Makefile | awk -F= '{ print $2 }'` else AC_MSG_ERROR([not found]) fi]) |