source: scripts/patches/binutils-2.15.90.0.1-genscripts-multilib.patch@ dc227cd

clfs-1.2 clfs-2.1 clfs-3.0.0-systemd clfs-3.0.0-sysvinit systemd sysvinit
Last change on this file since dc227cd was 7f65c0e, checked in by Jim Gifford <clfs@…>, 19 years ago

r625@server (orig r623): jim | 2005-10-31 12:43:24 -0800
Final Move
  • Property mode set to 100644
File size: 1.4 KB

  • binutils-2.15.90.0. 

    diff -uNr binutils-2.15.90.0.1-ORIG/ld/genscripts.sh binutils-2.15.90.0.1/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=
     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
    131141
    132   libs=${NATIVE_LIB_DIRS}
    133142  if [ "x${use_sysroot}" != "xyes" ] ; then
    134     case " ${libs} " in
    135       *" ${libdir} "*) ;;
    136       *) libs="${libdir} ${libs}" ;;
    137     esac
     143    if [ "x${skip_libdir}" != "xyes" ] ; then
     144      case " ${libs} " in
     145        *" ${libdir} "*) ;;
     146        *) libs="${libdir} ${libs}" ;;
     147      esac
     148    fi
    138149    case " ${libs} " in
    139150      *" ${tool_lib} "*) ;;
    140151      *) libs="${tool_lib} ${libs}" ;;
Note: See TracBrowser for help on using the repository browser.