X-Git-Url: http://gitweb.hugovil.com/?a=blobdiff_plain;f=stage0%2Fpkg%2Fgcc;h=423b93252ddda248facc838fd0df6874a87972bb;hb=b5bfb2006502b57fab234345a2393fd04e6d55ad;hp=5746dab59250130431e79768f954f976322d0896;hpb=69ac3e7cf686f8e95e47a7ab89bc38796aace488;p=hvlinux.git

diff --git a/stage0/pkg/gcc b/stage0/pkg/gcc
index 5746dab..423b932 100644
--- a/stage0/pkg/gcc
+++ b/stage0/pkg/gcc
@@ -1,5 +1,8 @@
 #!/bin/bash
 
+AR=ar
+LDFLAGS="-Wl,-rpath,/cross-tools/lib"
+
 hvpatch()
 {
     # Manually applying patches if specified
@@ -19,7 +22,7 @@ hvpatch()
     esac
 }
 
-configure_pre()
+hvconfig_pre()
 {
     # Common options for passes 1 & 2
     CONFIGURE_OPTS="${CONFIGURE_OPTS} \
@@ -32,7 +35,7 @@ configure_pre()
         --with-mpfr=/cross-tools \
         --with-gmp=/cross-tools"
 
-    if [ -n "${GCC_PASS1}" ]; then
+    if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
         CONFIGURE_OPTS="${CONFIGURE_OPTS} \
             --disable-shared \
             --without-headers \
@@ -73,7 +76,7 @@ configure_pre()
     sed -e "s@\(^CROSS_SYSTEM_HEADER_DIR =\).*@\1 /tools/include@g" \
         -i gcc/Makefile.in
 
-    if [ -n "${GCC_PASS1}" ]; then
+    if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
         # We will create a dummy limits.h so the build will not use the one
         # provided by the host distro:
         touch /tools/include/limits.h
@@ -82,7 +85,7 @@ configure_pre()
 
 hvbuild()
 {
-    if [ -n "${GCC_PASS1}" ]; then
+    if [ "x${HVLABEL}" = "x${GCC}-pass1" ]; then
         ${HVMAKE} all-gcc all-target-libgcc
         ${HVMAKE} install-gcc install-target-libgcc
     else