X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fhv-install-2;h=5bff46283cbf426f2117da339d4082f2997f2848;hb=2d56e369dbc033f743dfcc0b392c844d6299937b;hp=7b7f32e998463dfcb6e9965140a1404f6e60ccd5;hpb=25444ab74e068ffdba5d00817d7eb0daff096839;p=hvlinux.git

diff --git a/stage0/hv-install-2 b/stage0/hv-install-2
index 7b7f32e..5bff462 100755
--- a/stage0/hv-install-2
+++ b/stage0/hv-install-2
@@ -6,43 +6,36 @@ source ../functions/main
 init_log_file
 
 if [ x"${INSTALL_GLIBC}" == x"1" ]; then
-    ipkg -m noac ${KERNEL}
+    ipkg -m noac -l "kernel-headers" -s "kernel-headers" ${KERNEL}
 fi
 
-case "${HVL_TARGET}" in
-    x86*)
-        ipkg ${FILE_PKG}
-        ipkg ${NCURSES}
-        ;;
-esac
-
 ipkg ${GMP} "\
     --enable-cxx \
     --disable-static"
 
-export LDFLAGS="-Wl,-rpath,/cross-tools/lib"
+export LDFLAGS="-Wl,-rpath,${CROSS_TOOLS_DIR}/lib"
 
 ipkg ${MPFR} "\
     --disable-static \
-    --with-gmp=/cross-tools"
+    --with-gmp=${CROSS_TOOLS_DIR}"
 
 ipkg ${MPC} "\
     --disable-static \
-    --with-gmp=/cross-tools \
-    --with-mpfr=/cross-tools"
+    --with-gmp=${CROSS_TOOLS_DIR} \
+    --with-mpfr=${CROSS_TOOLS_DIR}"
 
 ipkg ${ISL} "\
     --disable-static \
-    --with-gmp-prefix=/cross-tools"
+    --with-gmp-prefix=${CROSS_TOOLS_DIR}"
 
 ipkg ${CLOOG} "\
     --disable-static \
     --with-bits=gmp \
-    --with-gmp-prefix=/cross-tools"
+    --with-gmp-prefix=${CROSS_TOOLS_DIR}"
 
 LDFLAGS=""
 
-ipkg ${BINUTILS}
+ipkg -i ${LFS} ${BINUTILS}
 ipkg -l "${GCC}-pass1" ${GCC}
 
 if [ x"${INSTALL_GLIBC}" == x"1" ]; then
@@ -50,4 +43,8 @@ if [ x"${INSTALL_GLIBC}" == x"1" ]; then
     ipkg -l "${GCC}-pass2" ${GCC}
 fi
 
+if [ x"${HVL_TARGET}" == x"avr" ]; then
+    ipkg ${AVRLIBC} "--host=avr"
+fi
+
 exit $?