X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpkg%2Feglibc;h=d86bf1aeee7dd7128fa3e3836fc1df0faa618cc2;hb=c40cf9db268db61676c4e239314317e74fdbf87c;hp=268e0b995ac4e6a4e53886c16008ede53896bb44;hpb=81da365042d1bf4354e0480d888fe3b8425c47c7;p=hvlinux.git

diff --git a/stage0/pkg/eglibc b/stage0/pkg/eglibc
index 268e0b9..d86bf1a 100644
--- a/stage0/pkg/eglibc
+++ b/stage0/pkg/eglibc
@@ -14,25 +14,19 @@ hvconfig_pre()
         --disable-profile \
         --enable-add-ons \
         --with-tls \
-        --enable-kernel=$(get_pkg_ver ${KERNEL}) \
+        --enable-kernel=$(get_pkg_ver3 ${KERNEL}) \
         --with-__thread \
         --with-binutils=/cross-tools/bin \
         --with-headers=/tools/include"
 
-    case "${HVL_TARGET}" in
-        "x86")
-            CFLAGS="-march=$(cut -d- -f1 <<< ${CLFS_TARGET}) -mtune=native -g -O2"
-            ;;
-        "x86_64")
-            CFLAGS="-mtune=native -g -O2"
-            ;;
-    esac
-
     cd ${LFS_TMP}/${PACKAGE}
 
     decompress_package ${EGLIBC_PORTS} $(pwd) 1> /dev/null
 
-    # Disable linking to libgcc_eh:
+    # libgcc_eh.a does not get built if building GCC with `--disable-shared'.
+    # The objects that would otherwise end up in libgcc_eh.a end up in libgcc.a
+    # instead. Unfortunately, Glibc insists upon linking with `-lgcc_eh'.
+    # Therefore, disable linking to libgcc_eh:
     sed -e 's/-lgcc_eh//g' -i Makeconfig
 }
 
@@ -47,11 +41,16 @@ libc_cv_ssp=no
 EOF
 }
 
+hvbuild()
+{
+    ${HVMAKE}
+    ${HVMAKE} install inst_vardbdir=/tools/var/db
+}
+
 hvconfig_post()
 {
     unset BUILD_CC
     unset CC
     unset AR
     unset RANLIB
-    unset CFLAGS
 }