yggdrasil/binutils-gdb
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* genscripts.sh (LIB_PATH): Don't append LIBPATH_SUFFIX to paths

Browse Source 
which already have it.  Avoid duplicates.
This commit is contained in:
Jakub Jelinek 2003-02-07 14:21:03 +00:00
parent c328dc3fe7
commit d460ab5823
2 changed files with 29 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
ld/ChangeLog
View File

@ -1,3 +1,8 @@
2003-02-07 Jakub Jelinek <jakub@redhat.com>
* genscripts.sh (LIB_PATH): Don't append LIBPATH_SUFFIX to paths
which already have it. Avoid duplicates.
2003-02-06 Jakub Jelinek <jakub@redhat.com> 2003-02-06 Jakub Jelinek <jakub@redhat.com>
* emulparams/elf64_s390.sh (LIBPATH_SUFFIX): Set to 64. * emulparams/elf64_s390.sh (LIBPATH_SUFFIX): Set to 64.

31
ld/genscripts.sh
View File

@ -77,20 +77,37 @@ if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
if [ x"$use_sysroot" != xyes ] ; then if [ x"$use_sysroot" != xyes ] ; then
LIB_PATH=${libdir} LIB_PATH=${libdir}
fi fi
LIB_PATH2=""
for lib in ${NATIVE_LIB_DIRS}; do for lib in ${NATIVE_LIB_DIRS}; do
# The "=" is harmless if we aren't using a sysroot, but also needless. # The "=" is harmless if we aren't using a sysroot, but also needless.
if [ "x${use_sysroot}" = "xyes" ] ; then if [ "x${use_sysroot}" = "xyes" ] ; then
lib="=${lib}" lib="=${lib}"
fi fi
case :${LIB_PATH}: in addsuffix=
*:${lib}:*) ;; case "${LIBPATH_SUFFIX}:${lib}" in
::) LIB_PATH=${lib} ;; :*) ;;
*) LIB_PATH=${LIB_PATH}:${lib} ;; *:*${LIBPATH_SUFFIX}) ;;
*) addsuffix=yes ;;
esac esac
if test -n "$addsuffix"; then
case :${LIB_PATH}: in
*:${lib}${LIBPATH_SUFFIX}:*) ;;
::) LIB_PATH=${lib}${LIBPATH_SUFFIX} ;;
*) LIB_PATH=${LIB_PATH}:${lib}${LIBPATH_SUFFIX} ;;
esac
case :${LIB_PATH}${LIB_PATH2}: in
*:${lib}:*) ;;
*) LIB_PATH2=${LIB_PATH2}:${lib} ;;
esac
else
case :${LIB_PATH}: in
*:${lib}:*) ;;
::) LIB_PATH=${lib} ;;
*) LIB_PATH=${LIB_PATH}:${lib} ;;
esac
fi
done done
if test -n "$LIBPATH_SUFFIX" ; then LIB_PATH=${LIB_PATH}${LIB_PATH2}
LIB_PATH=`echo ${LIB_PATH}: | sed -e s,:,${LIBPATH_SUFFIX}:,g`$LIB_PATH
fi
fi fi