clfs-1.2
clfs-2.1
clfs-3.0.0-systemd
clfs-3.0.0-sysvinit
systemd
sysvinit
Last change
on this file since 3793118a 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
|
Rev | Line | |
---|
[617118d] | 1 | diff -uNr binutils-2.15.90.0.1-ORIG/ld/genscripts.sh binutils-2.15.90.0.1/ld/genscripts.sh
|
---|
| 2 | --- binutils-2.15.90.0.1-ORIG/ld/genscripts.sh 2004-03-04 07:24:34.000000000 +1100
|
---|
| 3 | +++ binutils-2.15.90.0.1/ld/genscripts.sh 2004-03-21 17:30:10.000000000 +1100
|
---|
| 4 | @@ -103,8 +103,13 @@
|
---|
| 5 | if [ "x${host}" = "x${target}" ] ; then
|
---|
| 6 | NATIVE=yes
|
---|
| 7 | USE_LIBPATH=yes
|
---|
| 8 | + skip_libdir=no
|
---|
| 9 | elif [ "x${use_sysroot}" = "xyes" ] ; then
|
---|
| 10 | USE_LIBPATH=yes
|
---|
| 11 | + skip_libdir=no
|
---|
| 12 | + elif [ "x${LIB_PATH}" != "x" ] ; then
|
---|
| 13 | + USE_LIBPATH=yes
|
---|
| 14 | + skip_libdir=yes
|
---|
| 15 | fi
|
---|
| 16 | ;;
|
---|
| 17 | esac
|
---|
| 18 | @@ -125,16 +130,22 @@
|
---|
| 19 | #
|
---|
| 20 | # If the emulparams file set LIBPATH_SUFFIX, prepend an extra copy of
|
---|
| 21 | # the library path with the suffix applied.
|
---|
| 22 | -
|
---|
| 23 | -if [ "x${LIB_PATH}" = "x" ] && [ "x${USE_LIBPATH}" = xyes ] ; then
|
---|
| 24 | +if [ "x${USE_LIBPATH}" = xyes ] ; then
|
---|
| 25 | LIB_PATH2=
|
---|
| 26 | + if [ "x${LIB_PATH}" = "x" ] ; then
|
---|
| 27 | + libs="${NATIVE_LIB_DIRS}"
|
---|
| 28 | + else
|
---|
| 29 | + libs=`echo ${LIB_PATH} | sed 's/:/ /g'`
|
---|
| 30 | + LIB_PATH=
|
---|
| 31 | + fi
|
---|
| 32 |
|
---|
| 33 | - libs=${NATIVE_LIB_DIRS}
|
---|
| 34 | if [ "x${use_sysroot}" != "xyes" ] ; then
|
---|
| 35 | - case " ${libs} " in
|
---|
| 36 | - *" ${libdir} "*) ;;
|
---|
| 37 | - *) libs="${libdir} ${libs}" ;;
|
---|
| 38 | - esac
|
---|
| 39 | + if [ "x${skip_libdir}" != "xyes" ] ; then
|
---|
| 40 | + case " ${libs} " in
|
---|
| 41 | + *" ${libdir} "*) ;;
|
---|
| 42 | + *) libs="${libdir} ${libs}" ;;
|
---|
| 43 | + esac
|
---|
| 44 | + fi
|
---|
| 45 | case " ${libs} " in
|
---|
| 46 | *" ${tool_lib} "*) ;;
|
---|
| 47 | *) libs="${tool_lib} ${libs}" ;;
|
---|
Note:
See
TracBrowser
for help on using the repository browser.