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/Makefile.in | |
| 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/Makefile.in')
| -rw-r--r-- | libobjc/Makefile.in | 22 |
1 files changed, 20 insertions, 2 deletions
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 >> $@ |