X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fhv-install-2;h=5bff46283cbf426f2117da339d4082f2997f2848;hb=4e78d26dd7f5e46a21cdc916e031f1b4a68578c0;hp=0be337f8dfd0c0acdda959725cc367ad5ebedc41;hpb=156c4e984968dd572d24a265085f1487815b7009;p=hvlinux.git

diff --git a/stage0/hv-install-2 b/stage0/hv-install-2
index 0be337f..5bff462 100755
--- a/stage0/hv-install-2
+++ b/stage0/hv-install-2
@@ -1,55 +1,50 @@
 #!/bin/bash
 
 source ~/.bashrc
-
 source ../functions/main
 
 init_log_file
 
-ipkg -m noac ${KERNEL}
-
-case "${HVL_TARGET}" in
-    x86*)
-        ipkg ${FILE_PKG}
-        ipkg ${NCURSES}
-        ;;
-esac
+if [ x"${INSTALL_GLIBC}" == x"1" ]; then
+    ipkg -m noac -l "kernel-headers" -s "kernel-headers" ${KERNEL}
+fi
 
-CPPFLAGS=-fexceptions \
-    ipkg ${GMP} "\
+ipkg ${GMP} "\
     --enable-cxx \
     --disable-static"
 
-export LDFLAGS="-Wl,-rpath,/cross-tools/lib"
+export LDFLAGS="-Wl,-rpath,${CROSS_TOOLS_DIR}/lib"
 
 ipkg ${MPFR} "\
-    --enable-shared \
     --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}"
 
-CPPFLAGS="-I/cross-tools/include" \
-    ipkg ${PPL} "\
-    --enable-shared \
+ipkg ${ISL} "\
     --disable-static \
-    --enable-interfaces=c,cxx \
-    --disable-optimization \
-    --with-gmp=/cross-tools"
+    --with-gmp-prefix=${CROSS_TOOLS_DIR}"
+
 ipkg ${CLOOG} "\
-    --enable-shared \
     --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}
-ipkg ${EGLIBC}
-ipkg -l "${GCC}-pass2" ${GCC}
+
+if [ x"${INSTALL_GLIBC}" == x"1" ]; then
+    ipkg ${GLIBC}
+    ipkg -l "${GCC}-pass2" ${GCC}
+fi
+
+if [ x"${HVL_TARGET}" == x"avr" ]; then
+    ipkg ${AVRLIBC} "--host=avr"
+fi
 
 exit $?