source: patches/binutils-2.14.90.0.8-genscripts-multilib.patch @ 617118d

clfs-1.2clfs-2.1clfs-3.0.0-systemdclfs-3.0.0-sysvinitsystemdsysvinit
Last change on this file since 617118d was 617118d, checked in by Jim Gifford <clfs@…>, 18 years ago

r561@server (orig r559): root | 2005-06-05 02:38:49 -0700
Fixed Directory Structure

  • Property mode set to 100644
File size: 1.9 KB
  • binutils-2.14.90.0.

    diff -uNr binutils-2.14.90.0.8-ORIG/ld/genscripts.sh binutils-2.14.90.0.8/ld/genscripts.sh
    old new  
    103103    if [ "x${host}" = "x${target}" ] ; then
    104104      NATIVE=yes
    105105      USE_LIBPATH=yes
     106      skip_libdir=no
    106107    elif [ "x${use_sysroot}" = "xyes" ] ; then
    107108      USE_LIBPATH=yes
     109      skip_libdir=no
     110    elif [ "x${LIB_PATH}" != "x" ] ; then
     111      USE_LIBPATH=yes
     112      skip_libdir=yes
    108113    fi
    109114    ;;
    110115esac
     
    125130#
    126131# If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
    127132# the library path with the suffix applied.
    128 
    129 if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
     133if [ "x${USE_LIBPATH}" = xyes ] ; then
    130134  LIB_PATH2=
    131   if [ x"$use_sysroot" != xyes ] ; then
    132     LIB_PATH2=${libdir}
     135  if [ "x${LIB_PATH}" = "x" ] ; then
     136    libs="${NATIVE_LIB_DIRS}"
     137  else
     138    libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
     139    LIB_PATH=
     140  fi
     141
     142  if [ "x${use_sysroot}" != "xyes" ] ; then
     143    if [ "x${skip_libdir}" != "xyes" ] ; then
     144      case " ${libs} " in
     145        *" ${libdir} "*) ;;
     146        *) libs="${libdir} ${libs}" ;;
     147      esac
     148    fi
     149    case " ${libs} " in
     150      *" ${tool_lib} "*) ;;
     151      *) libs="${tool_lib} ${libs}" ;;
     152    esac
    133153  fi
    134   for lib in ${NATIVE_LIB_DIRS}; do
     154
     155  for lib in ${libs}; do
    135156    # The "=" is harmless if we aren't using a sysroot, but also needless.
    136157    if [ "x${use_sysroot}" = "xyes" ] ; then
    137158      lib="=${lib}"
     
    161182      esac
    162183    fi
    163184  done
     185
    164186  case :${LIB_PATH}:${LIB_PATH2}: in
    165187    *:: | ::*) LIB_PATH=${LIB_PATH}${LIB_PATH2} ;;
    166188    *) LIB_PATH=${LIB_PATH}:${LIB_PATH2} ;;
    167189  esac
    168190fi
    169191
    170 
    171192# Always search $(tooldir)/lib, aka /usr/local/TARGET/lib, except for
    172193# sysrooted configurations and when LIBPATH=":".
    173194if [ "x${use_sysroot}" != "xyes" ] ; then
Note: See TracBrowser for help on using the repository browser.