]> git.ipfire.org Git - people/pmueller/ipfire-2.x.git/commitdiff
Config: Disable parallel builds for Cargo on riscv64
authorMichael Tremer <michael.tremer@ipfire.org>
Tue, 22 Feb 2022 12:51:35 +0000 (12:51 +0000)
committerPeter Müller <peter.mueller@ipfire.org>
Tue, 22 Feb 2022 19:41:39 +0000 (19:41 +0000)
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

index 9309b832d89a857781cfbfbb467861a07eac44c7..53f31ed634854063a32eee168cc6b7fac7829a72 100644 (file)
@@ -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 && \