Canadian-Cross patch not working :(

[Brendan John Simon <brendan@dgs.monash.edu.au>]

Mumit Khan wrote:

> > > It seems that cc1obj can not be found.  On closer inspection, the file crea
> > ted
> > > is ./cc1obj.exe and the Makefile is trying to execute ./cc1obj.  Is this a
> > bug
> > > in the configure script or Makefile ?
>
> >  Anyway my fix would be that the input Objective-C part for Makefile would
> > have a definition for 'OBJC_FOR_TARGET' somewhere in the beginning:
> >
> >    OBJC_FOR_TARGET = `$(GCC_FOR_TARGET) -print-prog-name=cc1obj`
>
> I fixed this for gcc-2.95 back in April. See:
>
>    Linkname: (libobjc) config patch for canadian cross
>    URL: http://egcs.cygnus.com/ml/gcc-patches/1999-04/msg00925.html

I saved the above URL as text and tried to apply the patch with "patch -p1 <
canadian.diff" but I could not get it to work.  I have stripped off the
headers/trailiers and the contents of canadian.diff is listed below.  I notice
that the "RCS file" line mentions "libobjc".  This directory does not exist in my
egcs-1.1.2 source tree.  Is this patch only suitable for the egcs-1.2-dev2 source
tree ?  How can I apply these changes to my egcs-1.1.2 source.

Thanks,
Brendan Simon.

PS. Please forgive my patch/diff ignorance :)


---- Contents of canadian.dff follows  ----

Index: Makefile.in
===================================================================
RCS file: /homes/khan/src/CVSROOT/egcs-1.2-dev2/libobjc/Makefile.in,v
retrieving revision 1.1.1.1
diff -u -3 -p -r1.1.1.1 Makefile.in
--- Makefile.in 1999/04/22 21:35:06     1.1.1.1
+++ Makefile.in 1999/04/23 23:58:16
@@ -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 encodi
          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


_______________________________________________
New CrossGCC FAQ: http://www.objsw.com/CrossGCC
_______________________________________________
To remove yourself from the crossgcc list, send
mail to crossgcc-request@cygnus.com with the
text 'unsubscribe' (without the quotes) in the
body of the message.