diff options
| author | Alan Modra <amodra@gcc.gnu.org> | 2004-12-04 19:52:32 +1030 |
|---|---|---|
| committer | Alan Modra <amodra@gcc.gnu.org> | 2004-12-04 19:52:32 +1030 |
| commit | d12c5a4ce59517150a10fecf787bc16fd6a2d96a (patch) | |
| tree | cda19c328108111f0a80088112160d7d214ff2ff /gcc/mklibgcc.in | |
| parent | 493bc46004681c9ab631a38fc62f086f6274aaea (diff) | |
| download | gcc-d12c5a4ce59517150a10fecf787bc16fd6a2d96a.zip gcc-d12c5a4ce59517150a10fecf787bc16fd6a2d96a.tar.gz gcc-d12c5a4ce59517150a10fecf787bc16fd6a2d96a.tar.bz2 | |
mklibgcc.in: Build shared libgcc and shared libunwind in gcc/.
* 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.
From-SVN: r91724
Diffstat (limited to 'gcc/mklibgcc.in')
| -rw-r--r-- | gcc/mklibgcc.in | 18 |
1 files changed, 6 insertions, 12 deletions
diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index cfef2bf..9729f2b 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -173,21 +173,21 @@ for ml in $MULTILIBS; do if [ -z "$SHLIB_MULTILIB" ]; then if [ "$dir" = . ]; then libgcc_eh_a=$dir/libgcc_eh.a - libgcc_s_so_base=$dir/libgcc_s + libgcc_s_so_base=libgcc_s libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT} libgcc_s_soname=libgcc_s if [ "$LIBUNWIND" ]; then - libunwind_so_base=$dir/libunwind + libunwind_so_base=libunwind libunwind_so=${libunwind_so_base}${SHLIB_EXT} libunwind_soname=libunwind fi else libgcc_eh_a=$dir/libgcc_eh.a - libgcc_s_so_base=$dir/libgcc_s_${suffix} + libgcc_s_so_base=libgcc_s_${suffix} libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT} libgcc_s_soname=libgcc_s_${suffix} if [ "$LIBUNWIND" ]; then - libunwind_so_base=$dir/libunwind_${suffix} + libunwind_so_base=libunwind_${suffix} libunwind_so=${libunwind_so_base}${SHLIB_EXT} fi fi @@ -215,11 +215,11 @@ for ml in $MULTILIBS; do elif [ "$SHLIB_MULTILIB" = "$dir" ]; then libgcc_eh_a=$dir/libgcc_eh.a - libgcc_s_so_base=$dir/libgcc_s + libgcc_s_so_base=libgcc_s libgcc_s_so=${libgcc_s_so_base}${SHLIB_EXT} libgcc_s_soname=libgcc_s if [ "$LIBUNWIND" ]; then - libunwind_so_base=$dir/libunwind + libunwind_so_base=libunwind libunwind_so=${libunwind_so_base}${SHLIB_EXT} libunwind_soname=libunwind fi @@ -774,7 +774,6 @@ EOF -e "s%@shlib_base_name@%$libgcc_s_so_base%g" \ -e "s%@shlib_so_name@%$libgcc_s_soname%g" \ -e "s%@shlib_map_file@%$mapfile%g" \ - -e "s%@shlib_dir@%$shlib_dir%g" \ -e "s%@shlib_slibdir_qual@%$shlib_dir_qual%g" echo "all: $libgcc_s_so" fi @@ -788,7 +787,6 @@ EOF -e "s%@shlib_objs@%\$(objects)%g" \ -e "s%@shlib_base_name@%$libunwind_so_base%g" \ -e "s%@shlib_so_name@%$libunwind_soname%g" \ - -e "s%@shlib_dir@%$shlib_dir%g" \ -e "s%@shlib_slibdir_qual@%$shlib_dir_qual%g" echo "all: $libunwind_so" fi @@ -870,13 +868,11 @@ for ml in $MULTILIBS; do echo " $SHLIB_INSTALL" \ | sed -e "s%@shlib_base_name@%$shlib_base_name%g" \ -e "s%@shlib_so_name@%$shlib_so_name%g" \ - -e "s%@shlib_dir@%$shlib_dir%g" \ -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g" if [ "$LIBUNWIND" ]; then echo " $SHLIBUNWIND_INSTALL" \ | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \ -e "s%@shlib_so_name@%$shlibunwind_so_name%g" \ - -e "s%@shlib_dir@%$shlib_dir%g" \ -e "s%@shlib_slibdir_qual@%$shlib_slibdir_qual%g" libunwinddir='$(DESTDIR)$(slibdir)$(shlib_slibdir_qual)/$(shlib_dir)' echo ' $(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/ @@ -887,13 +883,11 @@ for ml in $MULTILIBS; do echo " $SHLIB_INSTALL" \ | sed -e "s%@shlib_base_name@%$shlib_base_name%g" \ -e "s%@shlib_so_name@%$shlib_base_name%g" \ - -e "s%@shlib_dir@%%g" \ -e "s%@shlib_slibdir_qual@%%g" if [ "$LIBUNWIND" ]; then echo " $SHLIBUNWIND_INSTALL" \ | sed -e "s%@shlib_base_name@%$shlibunwind_base_name%g" \ -e "s%@shlib_so_name@%$shlibunwind_base_name%g" \ - -e "s%@shlib_dir@%%g" \ -e "s%@shlib_slibdir_qual@%%g" libunwinddir='$(DESTDIR)$(slibdir)' echo ' $(INSTALL_DATA)' ${dir}/libunwind.a ${libunwinddir}/ |