Merge branch 'next' of ssh://git.ipfire.org/pub/git/ipfire-2.x into next

[ipfire-2.x.git] / tools / make-functions

diff --git a/tools/make-functions b/tools/make-functions
index 9cf2fcfb472f0f10da31c293e06fa1e99539924a..439298b3fd03171cfb32245db6c6f669c9c1b993 100644 (file)
--- a/tools/make-functions
+++ b/tools/make-functions
@@ -142,13 +142,7 @@ configure_build() {
        # Enables hardening
        HARDENING_CFLAGS="-Wp,-D_FORTIFY_SOURCE=2 -fstack-protector-strong --param=ssp-buffer-size=4"
 
-       CFLAGS="-O2 -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
-
-       # Run compiler and assembler simultaneously on systems that have enough memory
-       if [ ${HOST_MEM} -ge 1024 ]; then
-               CFLAGS="${CFLAGS} -pipe"
-       fi
-
+       CFLAGS="-O2 -pipe -Wall -fexceptions -fPIC ${CFLAGS_ARCH}"
        CXXFLAGS="${CFLAGS}"
 
        # Determine parallelism
@@ -182,11 +176,7 @@ configure_build_guess() {
                        echo "aarch64"
                        ;;
 
-               armv7*)
-                       echo "armv7hl"
-                       ;;
-
-               armv6*|armv5*)
+               armv7*|armv6*|armv5*)
                        echo "armv5tel"
                        ;;