diff options
| author | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-04 09:22:32 +0000 |
|---|---|---|
| committer | amodra <amodra@138bc75d-0d04-0410-961f-82ee72b054a4> | 2004-12-04 09:22:32 +0000 |
| commit | 97745cc0148a83faafb5461666d6bb6b3ce3ecaa (patch) | |
| tree | cda19c328108111f0a80088112160d7d214ff2ff /gcc/config/t-slibgcc-sld | |
| parent | 7b023c17ba5756caaaee5cbff33d8718892b7597 (diff) | |
| download | ppe42-gcc-97745cc0148a83faafb5461666d6bb6b3ce3ecaa.tar.gz ppe42-gcc-97745cc0148a83faafb5461666d6bb6b3ce3ecaa.zip | |
* mklibgcc.in: Build shared libgcc and shared libunwind in gcc/.
Don't subst shlib_dir for SHLIB_LINK, SHLIBUNWIND_LINK,
SHLIB_INSTALL, and SHLIBUNWIND_INSTALL.
* config/i386/t-nwld (SHLIB_NAME): Use shlib_base_name in place of
shlib_dir and shlib_so_name.
* config/mips/t-slibgcc-irix (SHLIB_NAME): Likewise.
* config/t-libunwind-elf (SHLIB_NAME): Likewise.
* config/t-slibgcc-darwin (SHLIB_NAME): Likewise.
* config/t-slibgcc-elf-ver (SHLIB_NAME): Likewise.
* config/t-slibgcc-sld (SHLIB_NAME): Likewise.
(SHLIB_LINK): Don't use shlib_dir when creating symlink.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@91724 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/config/t-slibgcc-sld')
| -rw-r--r-- | gcc/config/t-slibgcc-sld | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/gcc/config/t-slibgcc-sld b/gcc/config/t-slibgcc-sld index 5f2a5cafcbd..9a81af9ceb7 100644 --- a/gcc/config/t-slibgcc-sld +++ b/gcc/config/t-slibgcc-sld @@ -3,7 +3,7 @@ SHLIB_EXT = .so SHLIB_SOLINK = @shlib_base_name@.so SHLIB_SONAME = @shlib_so_name@.so.1 -SHLIB_NAME = @shlib_dir@@shlib_so_name@.so.1 +SHLIB_NAME = @shlib_base_name@.so.1 SHLIB_MAP = @shlib_map_file@ SHLIB_OBJS = @shlib_objs@ SHLIB_SLIBDIR_QUAL = @shlib_slibdir_qual@ @@ -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_dir@$(SHLIB_SOLINK) && \ + rm -f $(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_SONAME) @shlib_dir@$(SHLIB_SOLINK) + $(LN_S) $(SHLIB_SONAME) $(SHLIB_SOLINK) # $(slibdir) double quoted to protect it from expansion while building # libgcc.mk. We want this delayed until actual install time. SHLIB_INSTALL = \ |
