From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Feb 2022 12:45:03 +0000 (+0000)
Subject: Config: Disable parallel builds for Cargo on riscv64
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8e5d0e59727d1c6456c44daa8a544a14a56cab9c;p=people%2Fms%2Fipfire-2.x.git

Config: Disable parallel builds for Cargo on riscv64

There seems to be some problem where Cargo deadlocks during the build
when running on mutliple cores simulteneously.

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

diff --git a/lfs/Config b/lfs/Config
index 9309b832d8..53f31ed634 100644
--- a/lfs/Config
+++ b/lfs/Config
@@ -209,9 +209,15 @@ CARGO = \
 	--offline
 
 CARGO_OPTIONS = \
-	$(MAKETUNING) \
 	-Z avoid-dev-deps
 
+# Cargo dealocks on riscv64 when building on multiple cores at the same time
+ifeq "$(BUILD_ARCH)" "riscv64"
+	CARGO_OPTIONS += -j1
+else
+	CARGO_OPTIONS += $(MAKETUNING)
+endif
+
 define CARGO_PREPARE
 	mkdir -p $(CARGO_PATH) && \
 	echo "$${CARGO_CONFIG}" > $(CARGO_PATH)/config && \