changeset 521:e7d1db74c942

More fiddling to make /tools vs /usr work.
author Rob Landley <rob@landley.net>
date Tue, 02 Dec 2008 04:57:26 -0600
parents 16adbffb58b0
children 148b62e763d3
files mini-native.sh
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/mini-native.sh	Tue Dec 02 04:49:10 2008 -0600
+++ b/mini-native.sh	Tue Dec 02 04:57:26 2008 -0600
@@ -17,10 +17,12 @@
 
   # Tell the wrapper script where to find the dynamic linker.
   export UCLIBC_DYNAMIC_LINKER=/tools/lib/ld-uClibc.so.0
-  export UCLIBC_DLPREFIX=/tools
+  UCLIBC_TOPDIR="${NATIVE}"
+  UCLIBC_DLPREFIX="/tools"
 else
   mkdir -p "${NATIVE}"/{tmp,proc,sys,dev,etc} || dienow
   TOOLS="${NATIVE}/usr"
+  UCLIBC_TOPDIR="${TOOLS}"
   for i in bin sbin lib
   do
     mkdir -p "$TOOLS/$i" || dienow
@@ -61,7 +63,8 @@
 fi
 make CROSS="${ARCH}=" KCONFIG_ALLCONFIG="${CONFIG_DIR}"/$CONFIGFILE allnoconfig &&
 cp .config "${TOOLS}"/src/config-uClibc &&
-make CROSS="${ARCH}-" KERNEL_HEADERS="${TOOLS}/include" PREFIX="${NATIVE}/" \
+make CROSS="${ARCH}-" KERNEL_HEADERS="${TOOLS}/include" \
+     PREFIX="${UCLIBC_TOPDIR}/" \
      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.