From 9b1f666eae381924b1b3bc1666cadc9ef3320955 Mon Sep 17 00:00:00 2001
From: Michael Tremer <michael.tremer@ipfire.org>
Date: Tue, 22 Feb 2022 12:51:35 +0000
Subject: [PATCH] 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>
---
 lfs/Config | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

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 && \
-- 
2.39.2