Makefile.in (CC1OBJ): Define in terms of CC.

        * Makefile.in (CC1OBJ): Define in terms of CC.
        (runtime-info.h): Use.

From-SVN: r26618

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index 6c1a864a82940ab4f91e5f8b2635c854f061a2c8..2baddb815fc246a6ccc4efa4750fc739d5b5e2f2 100644 (file)
--- 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 cc56ae0b91d650ef04a36263db40f8913808ce90..3bc11dc9427b5f00da10e87c55e9ad4d4bddd1b6 100644 (file)
--- 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