diff options
| author | Mumit Khan <khan@xraylith.wisc.edu> | 1999-04-25 00:21:51 +0000 |
|---|---|---|
| committer | Jeff Law <law@gcc.gnu.org> | 1999-04-24 18:21:51 -0600 |
| commit | 7af06410baaef87f08b4de072a8b2e86e894bc45 (patch) | |
| tree | daba63da0ed8bafc80a42412e669a9e6a56cdc40 /libobjc | |
| parent | 5b9ba539e6990eb67ac81a633938a9f023ac8235 (diff) | |
| download | gcc-7af06410baaef87f08b4de072a8b2e86e894bc45.zip gcc-7af06410baaef87f08b4de072a8b2e86e894bc45.tar.gz gcc-7af06410baaef87f08b4de072a8b2e86e894bc45.tar.bz2 | |
Makefile.in (CC1OBJ): Define in terms of CC.
* Makefile.in (CC1OBJ): Define in terms of CC.
(runtime-info.h): Use.
From-SVN: r26618
Diffstat (limited to 'libobjc')
| -rw-r--r-- | libobjc/ChangeLog | 5 | ||||
| -rw-r--r-- | libobjc/Makefile.in | 12 |
2 files changed, 15 insertions, 2 deletions
diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index 6c1a864..2baddb8 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,8 @@ +Sun Apr 25 01:15:34 1999 Mumit Khan <khan@xraylith.wisc.edu> + + * Makefile.in (CC1OBJ): Define in terms of CC. + (runtime-info.h): Use. + Fri April 8 08:21:07 1999 Ovidiu Predescu <ovidiu@cup.hp.com> * objc-features.texi: Updated the URL to Boehm's GC page. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index cc56ae0..3bc11dc 100644 --- a/libobjc/Makefile.in +++ b/libobjc/Makefile.in @@ -62,6 +62,14 @@ CC = @CC@ CFLAGS = @CFLAGS@ ALL_CFLAGS = -I. -I$(srcdir) $(CPPFLAGS) $(DEFS) $(CFLAGS) -DIN_GCC +# +# Define the cc1obj in terms of the CC that is passed on from higher +# level make. This is needed to make sure we can create runtime-info.h +# when doing canadian cross builds where running ../../gcc/cc1obj +# does not make any sense. +# +CC1OBJ = `$(CC) -print-prog-name=cc1obj` + INCLUDES = -I$(srcdir)/objc -I$(srcdir)/$(MULTISRCTOP)../gcc \ -I$(srcdir)/$(MULTISRCTOP)../gcc/config -I$(MULTIBUILDTOP)../../gcc \ -I$(srcdir)/$(MULTISRCTOP)../include @@ -118,10 +126,10 @@ 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: $(MULTIBUILDTOP)../../gcc/cc1obj +runtime-info.h: echo "" > tmp-runtime echo "/* This file is automatically generated */" > $@ - $(MULTIBUILDTOP)../../gcc/cc1obj -print-objc-runtime-info tmp-runtime >> $@ + $(CC1OBJ) -print-objc-runtime-info tmp-runtime >> $@ rm -f tmp-runtime archive_gc.o: archive.c |