changeset 519:1c36145a54d1

USE_TOOLSDIR should have ld-uClibc.so.0 fallback to search to /tools/lib rather than /lib, so adding incompatible libraries in /lib doesn't screw up binaries run out of /tools.
author Rob Landley <rob@landley.net>
date Tue, 02 Dec 2008 04:20:06 -0600
parents f109c324cca4
children 16adbffb58b0
files mini-native.sh
diffstat 1 files changed, 4 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mini-native.sh	Tue Dec 02 03:17:23 2008 -0600
+++ b/mini-native.sh	Tue Dec 02 04:20:06 2008 -0600
@@ -17,7 +17,7 @@
 
   # Tell the wrapper script where to find the dynamic linker.
   export UCLIBC_DYNAMIC_LINKER=/tools/lib/ld-uClibc.so.0
-  export UCLIBC_RPATH=/tools/lib
+  export UCLIBC_DLPREFIX=/tools
 else
   mkdir -p "${NATIVE}"/{tmp,proc,sys,dev,etc} || dienow
   TOOLS="${NATIVE}/usr"
@@ -61,8 +61,9 @@
 fi
 make CROSS="${ARCH}=" KCONFIG_ALLCONFIG="${CONFIG_DIR}"/$CONFIGFILE allnoconfig &&
 cp .config "${TOOLS}"/src/config-uClibc &&
-make CROSS="${ARCH}-" KERNEL_HEADERS="${TOOLS}/include" PREFIX="${TOOLS}/" \
-     RUNTIME_PREFIX=/ DEVEL_PREFIX=/ UCLIBC_LDSO_NAME=ld-uClibc $BUILDIT &&
+make CROSS="${ARCH}-" KERNEL_HEADERS="${TOOLS}/include" PREFIX="${NATIVE}/" \
+     RUNTIME_PREFIX="$UCLIBC_DLPREFIX/" DEVEL_PREFIX="$UCLIBC_DLPREFIX/" \
+     UCLIBC_LDSO_NAME=ld-uClibc $BUILDIT &&
 # utils_install wants to put stuff in usr/bin instead of bin.
 # make BLAH=blah utils
 # install -m 755 utils/{readelf,ldd,ldconfig} "${TOOLS}/bin" &&