diff options
| author | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-11-21 04:53:12 +0000 |
|---|---|---|
| committer | andreast <andreast@138bc75d-0d04-0410-961f-82ee72b054a4> | 2003-11-21 04:53:12 +0000 |
| commit | f6a282d288516bb050c153c1cb0b7865121890ce (patch) | |
| tree | 3122c3075ac1b8d8dbe8dfb0bdf002a331bd54a1 /gcc/mklibgcc.in | |
| parent | 5ff511113f0b782fb3957039df67360a2b9be636 (diff) | |
| download | gcc-f6a282d288516bb050c153c1cb0b7865121890ce.tar.gz | |
2003-11-21 Andreas Tobler <a.tobler@schweiz.ch>
* mklibgcc.in: Evaluate shlib_slibdir_qual during link
step too.
* config/t-slibgcc-darwin: Adjust install path.
* config/rs6000/t-darwin: Revert multilib matches since
it is not used on darwin.
git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@73790 138bc75d-0d04-0410-961f-82ee72b054a4
Diffstat (limited to 'gcc/mklibgcc.in')
| -rw-r--r-- | gcc/mklibgcc.in | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/gcc/mklibgcc.in b/gcc/mklibgcc.in index 28ea8532fa7..72c6c226986 100644 --- a/gcc/mklibgcc.in +++ b/gcc/mklibgcc.in @@ -388,6 +388,7 @@ EOF fi shlib_so_name="$shlib_base_name" shlib_dir= + shlib_slibdir_qual= if [ -n "$MULTILIB_OSDIRNAMES" ]; then if [ "$dir" != . ]; then gcc_multilib_dir=`./xgcc -B./ $flags --print-multi-directory` @@ -397,8 +398,12 @@ EOF os_multilib_base=`echo $os_multilib_dir | sed -n "s~/${gcc_multilib_sup}\$~~p"` if [ -z "$os_multilib_base" ]; then shlib_so_name=libgcc_s + if [ "$os_multilib_dir" != "." ]; then + shlib_slibdir_qual="/$os_multilib_dir" + fi else shlib_so_name=libgcc_s_`echo $gcc_multilib_sup | sed s,/,_,g` + shlib_slibdir_qual="/$os_multilib_base" fi fi fi @@ -411,7 +416,8 @@ EOF -e "s%@shlib_base_name@%$shlib_base_name%g" \ -e "s%@shlib_map_file@%$mapfile%g" \ -e "s%@shlib_so_name@%$shlib_so_name%g" \ - -e "s%@shlib_dir@%$shlib_dir%g" + -e "s%@shlib_dir@%$shlib_dir%g" \ + -e "s%@shlib_slibdir_qual@%%g" elif [ "$SHLIB_MULTILIB" = "$dir" ]; then shlib_base_name="libgcc_s"; echo "" @@ -423,7 +429,8 @@ EOF -e "s%@shlib_base_name@%$shlib_base_name%g" \ -e "s%@shlib_map_file@%$mapfile%g" \ -e "s%@shlib_so_name@%$shlib_base_name%g" \ - -e "s%@shlib_dir@%%g" + -e "s%@shlib_dir@%%g" \ + -e "s%@shlib_slibdir_qual@%%g" fi fi done |