X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpkg%2Feglibc;h=d86bf1aeee7dd7128fa3e3836fc1df0faa618cc2;hb=f17ab848cb756cad27489bf0c2746e5ead466658;hp=fe9dfe2407680d01a0bb5cf6dd345de8c1b88468;hpb=3605ab38ca7604b1fe43c3bce5e4963730a85d39;p=hvlinux.git

diff --git a/stage0/pkg/eglibc b/stage0/pkg/eglibc
index fe9dfe2..d86bf1a 100644
--- a/stage0/pkg/eglibc
+++ b/stage0/pkg/eglibc
@@ -1,21 +1,34 @@
 #!/bin/bash
 
-BUILD_CC="gcc"
-CC="${CLFS_TARGET}-gcc ${CLFS_BUILDFLAGS}"
-AR="${CLFS_TARGET}-ar"
-RANLIB="${CLFS_TARGET}-ranlib"
-
-CONFIGURE_OPTS="\
-    --prefix=/tools \
-    --host=${CLFS_TARGET} \
-    --build=${CLFS_HOST} \
-    --disable-profile \
-    --enable-add-ons \
-    --with-tls \
-    --enable-kernel=$(get_pkg_ver ${KERNEL}) \
-    --with-__thread \
-    --with-binutils=/cross-tools/bin \
-    --with-headers=/tools/include"
+hvconfig_pre()
+{
+    export BUILD_CC="gcc"
+    export CC="${CLFS_TARGET}-gcc ${CLFS_BUILDFLAGS}"
+    export AR="${CLFS_TARGET}-ar"
+    export RANLIB="${CLFS_TARGET}-ranlib"
+
+    CONFIGURE_OPTS="\
+        --prefix=/tools \
+        --host=${CLFS_TARGET} \
+        --build=${CLFS_HOST} \
+        --disable-profile \
+        --enable-add-ons \
+        --with-tls \
+        --enable-kernel=$(get_pkg_ver3 ${KERNEL}) \
+        --with-__thread \
+        --with-binutils=/cross-tools/bin \
+        --with-headers=/tools/include"
+
+    cd ${LFS_TMP}/${PACKAGE}
+
+    decompress_package ${EGLIBC_PORTS} $(pwd) 1> /dev/null
+
+    # 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
+}
 
 # For Glibc to support NPTL:
 hvconfig_cache()
@@ -28,21 +41,16 @@ libc_cv_ssp=no
 EOF
 }
 
-hvconfig_pre()
+hvbuild()
 {
-    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
+    ${HVMAKE}
+    ${HVMAKE} install inst_vardbdir=/tools/var/db
+}
 
-    # Disable linking to libgcc_eh:
-    sed -e 's/-lgcc_eh//g' -i Makeconfig
+hvconfig_post()
+{
+    unset BUILD_CC
+    unset CC
+    unset AR
+    unset RANLIB
 }