Re: New libtool is in the GCC and Src trees.

["Andrew Pinski" <pinskia@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 514 bytes --]

On 5/24/07, Steve Ellcey <sje@cup.hp.com> wrote:
> The GCC and src trees have been updated with the new libtool.  Let me
> know if you run into problems.

And this breaks libobjc building libobjc.a and/or libobjc.so because
we now build libobja.a which is wrong.  This patch fixes the problem.

Committed after a bootstrap and tested on i686-linux-gnu with no
regressions and build and tested for spu-elf with no regressions.

Thanks,
Andrew Pinski

libobjc/ChangeLog:
* Makefile.in: Remove all uses of $(libext).

[-- Attachment #2: fixlibobjc.diff.txt --]
[-- Type: text/plain, Size: 2020 bytes --]

Index: Makefile.in
===================================================================
--- Makefile.in	(revision 125044)
+++ Makefile.in	(working copy)
@@ -42,7 +42,6 @@ toolexecdir = @toolexecdir@
 toolexeclibdir = @toolexeclibdir@
 
 includedirname = @includedirname@
-libext = @libext@
 
 extra_ldflags_libobjc = @extra_ldflags_libobjc@
 
@@ -137,7 +136,7 @@ FLAGS_TO_PASS = \
 	"libsubdir=$(libsubdir)" \
 	"tooldir=$(tooldir)"
 
-all: libobjc$(libext).la $(OBJC_BOEHM_GC)
+all: libobjc.la $(OBJC_BOEHM_GC)
 	: $(MAKE) ; exec $(MULTIDO) $(FLAGS_TO_PASS) multi-do DO=all
 
 # User-visible header files.
@@ -274,12 +273,12 @@ doc: info dvi pdf html
 install-html:
 install-pdf:
 
-libobjc$(libext).la: $(OBJS)
+libobjc.la: $(OBJS)
 	$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS) \
 		-rpath $(toolexeclibdir) \
 		-version-info $(LIBOBJC_VERSION) $(extra_ldflags_libobjc)
 
-libobjc_gc$(libext).la: $(OBJS_GC)
+libobjc_gc.la: $(OBJS_GC)
 	$(LIBTOOL_LINK) $(CC) -o $@ $(OBJS_GC) \
 		-rpath $(toolexeclibdir) \
 		-version-info $(LIBOBJC_GC_VERSION) $(extra_ldflags_libobjc)
@@ -334,9 +333,9 @@ install: install-libs install-headers
 
 install-libs: installdirs
 	$(SHELL) $(multi_basedir)/mkinstalldirs $(DESTDIR)$(toolexeclibdir)
-	$(LIBTOOL_INSTALL) $(INSTALL) libobjc$(libext).la $(DESTDIR)$(toolexeclibdir);
+	$(LIBTOOL_INSTALL) $(INSTALL) libobjc.la $(DESTDIR)$(toolexeclibdir);
 	if [ "$(OBJC_BOEHM_GC)" ]; then \
-	  $(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc$(libext).la \
+	  $(LIBTOOL_INSTALL) $(INSTALL) libobjc_gc.la \
 				$(DESTDIR)$(toolexeclibdir);\
 	fi
 	$(MULTIDO) $(FLAGS_TO_PASS) multi-do DO="$@"
@@ -353,7 +352,7 @@ install-headers:
 check uninstall install-strip dist installcheck installdirs:
 
 mostlyclean:
-	-$(LIBTOOL_CLEAN) rm -f libobjc$(libext).la libobjc_gc$(libext).la *.lo
+	-$(LIBTOOL_CLEAN) rm -f libobjc.la libobjc_gc.la *.lo
 	-rm -f runtime-info.h tmp-runtime.s *.o *.lo libobjc* xforward \
 		fflags *.aux *.cp *.dvi *.pdf *.fn *.info *.ky *.log *.pg \
 		*.toc *.tp *.vr *.html libobj.exp