From 9c0787e298c5c25dbbbc200ce787802a6d87a177 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Mon, 15 Nov 2004 15:55:45 +0000 Subject: t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely within the multilib directory. 2004-11-15 Mark Mitchell * config/t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely within the multilib directory. From-SVN: r90669 --- gcc/ChangeLog | 5 +++++ gcc/config/t-slibgcc-sld | 4 ++-- 2 files changed, 7 insertions(+), 2 deletions(-) (limited to 'gcc') diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 96e4dce28e3..6a8eda10503 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-11-15 Mark Mitchell + + * config/t-slibgcc-sld (SHLIB_LINK): Make symlinks entirely + within the multilib directory. + 2004-11-15 Nick Clifton * config/stormy16/stormy16.h (TARGET_CPU_CPP_BUILTINS): Add diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld index a4e5a07440b..5f2a5cafcbd 100644 --- 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 = \ -- cgit v1.2.1