From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 5 Jul 2024 08:58:09 +0000 (+0000)
Subject: make.sh: Build in a separate directory for each architecture
X-Git-Tag: v2.29-core188~10^2~354
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=38b4f088a25eb5a295fd82991139511acc288f17;p=ipfire-2.x.git

make.sh: Build in a separate directory for each architecture

This allows running multiple builds in the same working directory.

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/make.sh b/make.sh
index 400473f300..39e1b7c571 100755
--- a/make.sh
+++ b/make.sh
@@ -180,7 +180,6 @@ configure_build() {
 	fi
 
 	BUILD_ARCH="${build_arch}"
-	TOOLS_DIR="/tools_${BUILD_ARCH}"
 
 	# Enables hardening
 	HARDENING_CFLAGS="-Wp,-U_FORTIFY_SOURCE -Wp,-D_FORTIFY_SOURCE=3 -Wp,-D_GLIBCXX_ASSERTIONS -fstack-protector-strong -fstack-clash-protection"
@@ -1869,9 +1868,11 @@ done
 configure_build "${BUILD_ARCH}"
 
 # Set directories
+readonly CACHE_DIR="${BASEDIR}/cache"
 readonly CCACHE_DIR="${BASEDIR}/ccache/${BUILD_ARCH}/${TOOLCHAINVER}"
-readonly BUILD_DIR="${BASEDIR}/build"
-readonly LOG_DIR="${BASEDIR}/log"
+readonly BUILD_DIR="${BASEDIR}/build_${BUILD_ARCH}"
+readonly LOG_DIR="${BASEDIR}/log_${BUILD_ARCH}"
+readonly TOOLS_DIR="/tools_${BUILD_ARCH}"
 
 # Set the LOGFILE
 LOGFILE="${LOG_DIR}/_build.preparation.log"