binutils: Drop modifying CFLAGS in PASS=1

[ipfire-2.x.git] / make.sh

diff --git a/make.sh b/make.sh
index 7fe25b5c0288931b3f6f8b7cfc02cc37fff61556..fc1a02b33f5074c27456cc48aa934be0a1eb8e82 100755 (executable)
--- a/make.sh
+++ b/make.sh
@@ -260,6 +260,10 @@ buildtoolchain() {
             ;;
 
         # ARM
+        arvm7hl:armv7hl|armv7hl:armv7l)
+            # These are working.
+            ;;
+
         armv5tel:armv5tel|armv5tel:armv5tejl|armv5tel:armv6l|armv5tel:armv7l|armv5tel:aarch64)
             # These are working.
             ;;
@@ -279,14 +283,11 @@ buildtoolchain() {
     LOGFILE="$BASEDIR/log/_build.toolchain.log"
     export LOGFILE
 
-    local ORG_PATH=$PATH
-    export PATH="/tools/ccache/bin:/tools/bin:$PATH"
     lfsmake1 ccache                    PASS=1
     lfsmake1 binutils                  PASS=1
     lfsmake1 gcc                       PASS=1
-    lfsmake1 linux                     TOOLS=1 KCFG="-headers"
+    lfsmake1 linux                     KCFG="-headers"
     lfsmake1 glibc
-    lfsmake1 cleanup-toolchain         PASS=1
     lfsmake1 gcc                       PASS=L
     lfsmake1 binutils                  PASS=2
     lfsmake1 gcc                       PASS=2
@@ -315,8 +316,7 @@ buildtoolchain() {
     lfsmake1 texinfo
     lfsmake1 xz
     lfsmake1 fake-environ
-    lfsmake1 cleanup-toolchain         PASS=2
-    export PATH=$ORG_PATH
+    lfsmake1 cleanup-toolchain         PASS=1
 }
 
 buildbase() {
@@ -327,7 +327,7 @@ buildbase() {
     lfsmake2 man-pages
     lfsmake2 glibc
     lfsmake2 tzdata
-    lfsmake2 cleanup-toolchain         PASS=3
+    lfsmake2 cleanup-toolchain         PASS=2
     lfsmake2 zlib
     lfsmake2 binutils
     lfsmake2 gmp
@@ -491,6 +491,7 @@ buildipfire() {
   ipfiremake nettle
   ipfiremake libevent
   ipfiremake libevent2
+  ipfiremake libevent2-compat
   ipfiremake expat
   ipfiremake unbound
   ipfiremake gnutls