t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely within the multilib directory.

2004-11-15  Mark Mitchell <mark@codesourcery.com>

	* config/t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely
	within the multilib directory.

From-SVN: r90669

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 96e4dce28e3549eede8728ded8d49d932f84e712..6a8eda105031b90c98702546915316b6011495d1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-11-15  Mark Mitchell <mark@codesourcery.com>
+
+       * config/t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely
+       within the multilib directory.
+
 2004-11-15  Nick Clifton  <nickc@redhat.com>
 
        * config/stormy16/stormy16.h (TARGET_CPU_CPP_BUILTINS): Add

diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld
index a4e5a07440b27609e9ecf97179f25b181feb8039..5f2a5cafcbd8e797ec6e6a15b8704747acae1dd1 100644 (file)
--- a/gcc/config/t-slibgcc-sld
+++ b/gcc/config/t-slibgcc-sld
@@ -12,12 +12,12 @@ SHLIB_LINK = $(GCC_FOR_TARGET) $(LIBGCC2_CFLAGS) -shared -nodefaultlibs \
        -Wl,-h,$(SHLIB_SONAME) -Wl,-z,text -Wl,-z,defs \
        -Wl,-M,$(SHLIB_MAP) -o $(SHLIB_NAME).tmp \
        @multilib_flags@ $(SHLIB_OBJS) -lc && \
-       rm -f $(SHLIB_SOLINK) && \
+       rm -f @shlib_dir@$(SHLIB_SOLINK) && \
        if [ -f $(SHLIB_NAME) ]; then \
          mv -f $(SHLIB_NAME) $(SHLIB_NAME).`basename $(STAGE_PREFIX)`; \
        else true; fi && \
        mv $(SHLIB_NAME).tmp $(SHLIB_NAME) && \
-       $(LN_S) $(SHLIB_NAME) $(SHLIB_SOLINK)
+       $(LN_S) $(SHLIB_SONAME) @shlib_dir@$(SHLIB_SOLINK)
 # $(slibdir) double quoted to protect it from expansion while building
 # libgcc.mk.  We want this delayed until actual install time.
 SHLIB_INSTALL = \