* Makefile.in (CC1OBJ): Remove.

	(runtime-info.h): Invoke $(CC) so all MULTIFLAGS are handled
	correctly.
	Use .m extension for temporary file.
	Remove assembler temp file.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@72752 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog
index b3a26b2..3ba6964 100644 (file)
--- a/libobjc/ChangeLog
+++ b/libobjc/ChangeLog
@@ -1,3 +1,11 @@
+2003-10-21  Rainer Orth  <ro@TechFak.Uni-Bielefeld.DE>
+
+       * Makefile.in (CC1OBJ): Remove.
+       (runtime-info.h): Invoke $(CC) so all MULTIFLAGS are handled
+       correctly.
+       Use .m extension for temporary file.
+       Remove assembler temp file.
+
 2003-10-20  Joseph S. Myers  <jsm@polyomino.org.uk>
 
        * objc/hash.h (hash_string): Don't use a cast as an lvalue.

diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in
index 8589469..0f112c6 100644 (file)
--- a/libobjc/Makefile.in
+++ b/libobjc/Makefile.in
@@ -88,14 +88,6 @@ LIBTOOL_INSTALL = $(LIBTOOL) --mode=install
 LIBTOOL_CLEAN   = $(LIBTOOL) --mode=clean
 #LIBTOOL_UNINSTALL = $(LIBTOOL) --mode=uninstall
 
-#
-# 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
@@ -161,10 +153,10 @@ OBJS_GC = archive_gc.lo class_gc.lo encoding_gc.lo gc_gc.lo hash_gc.lo \
          $(OBJC_THREAD_FILE)_gc.lo
 
 runtime-info.h: 
-       echo "" > tmp-runtime
+       echo "" > tmp-runtime.m
        echo "/* This file is automatically generated */" > $@
-       $(CC1OBJ) $(MULTIFLAGS) -print-objc-runtime-info tmp-runtime >> $@
-       rm -f tmp-runtime
+       $(CC) $(MULTIFLAGS) -Wp,-print-objc-runtime-info -S tmp-runtime.m >> $@
+       rm -f tmp-runtime.m tmp-runtime.s
 
 archive_gc.lo: archive.c
        $(LIBTOOL_COMPILE) $(CC) -c  -o $@ $(ALL_CFLAGS) $(OBJC_GCFLAGS) \