t-slibgcc-darwin (SHLIB_LINK): Don't munge stmp-lipo.

2006-07-12  Eric Christopher  <echristo@apple.com>

	* config/t-slibgcc-darwin (SHLIB_LINK): Don't munge stmp-lipo.
	(stmp-lipo): Depend on libgcc.a.

From-SVN: r115409

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 8f732e56379a225296454f8b480f801870fcdce7..4c269fca6a18ef3f8599426a2d26a4de26ad4f94 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,10 +1,15 @@
+2006-07-12  Eric Christopher  <echristo@apple.com>
+
+       * config/t-slibgcc-darwin (SHLIB_LINK): Don't munge stmp-lipo.
+       (stmp-lipo): Depend on libgcc.a.
+
 2006-07-12  Kazu Hirata  <kazu@codesourcery.com>
 
        * tree.c: Fix a comment typo.
 
 2006-07-12  Naveen.H.S  <naveenh@kpitcummins.com>
 
-       * config/m32c/muldiv.md (umulhisi3_c): Use only registers for 
+       * config/m32c/muldiv.md (umulhisi3_c): Use only registers for
        dest.
        (umulhisi3_r): Likewise.
 

diff --git a/gcc/config/t-slibgcc-darwin b/gcc/config/t-slibgcc-darwin
index 67c0aed55d06b32fb54415cdd2afb54984d10b52..cfde598658015417db46481793e07869660d1f1d 100644 (file)
--- a/gcc/config/t-slibgcc-darwin
+++ b/gcc/config/t-slibgcc-darwin
@@ -20,10 +20,7 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -dynamiclib -nodefaultlibs \
        -single_module -o $(SHLIB_DIR)/$(SHLIB_SONAME).tmp \
        -Wl,-exported_symbols_list,$(SHLIB_MAP) \
        $(SHLIB_VERSTRING) \
-       @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC) && \
-       if [ -f stmp-lipo ]; then \
-         rm -f stmp-lipo; \
-       else true; fi
+       @multilib_flags@ $(SHLIB_OBJS) $(SHLIB_LC)
 
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
@@ -65,7 +62,7 @@ libgcc_s.%.dylib : $(SHLIB_VERPFX).%.ver libgcc.a
        $(LIPO_FOR_TARGET) -output $@ -create $(@)_T*
        rm $(@)_T*
 
-stmp-lipo: libgcc_s.10.4.dylib libgcc_s.10.5.dylib
+stmp-lipo: libgcc.a libgcc_s.10.4.dylib libgcc_s.10.5.dylib
        # When building multilibbed target libraries, all the required
        # libraries are expected to exist in the multilib directory.
        MLIBS=`$(GCC_FOR_TARGET) --print-multi-lib \