From 54b98a47dd95dfdc4f2ee8d66542baf044434599 Mon Sep 17 00:00:00 2001 From: Rainer Orth Date: Tue, 21 Oct 2003 14:11:13 +0000 Subject: [PATCH] Makefile.in (CC1OBJ): Remove. * 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. From-SVN: r72752 --- libobjc/ChangeLog | 8 ++++++++ libobjc/Makefile.in | 14 +++----------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/libobjc/ChangeLog b/libobjc/ChangeLog index b3a26b25209..3ba69649907 100644 --- a/libobjc/ChangeLog +++ b/libobjc/ChangeLog @@ -1,3 +1,11 @@ +2003-10-21 Rainer Orth + + * 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 * objc/hash.h (hash_string): Don't use a cast as an lvalue. diff --git a/libobjc/Makefile.in b/libobjc/Makefile.in index 85894698222..0f112c6764e 100644 --- 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) \ -- 2.30.2