From 03215924df044058fea8fa031fd61355f04acd11 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fabian=20Gr=C3=BCnbichler?= Date: Mon, 17 Feb 2025 13:19:21 +0100 Subject: [PATCH] build docs with -j1 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit they have an ordering problem that breaks reproducibility otherwise. Signed-off-by: Fabian Grünbichler --- debian/rules | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/debian/rules b/debian/rules index 31c23d6e36..1e56ff8aec 100755 --- a/debian/rules +++ b/debian/rules @@ -68,7 +68,10 @@ endif ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) NJOBS := -j $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) endif -RUSTBUILD = RUST_BACKTRACE=1 python3 src/bootstrap/bootstrap.py $(NJOBS) +RUSTBUILD_COMMON = RUST_BACKTRACE=1 python3 src/bootstrap/bootstrap.py +RUSTBUILD = $(RUSTBUILD_COMMON) $(NJOBS) +# force reproducibility +RUSTBUILD_DOCS = $(RUSTBUILD_COMMON) -j1 RUSTBUILD_FLAGS = --stage 2 --config debian/config.toml --on-fail env # rust-tidy depends on lots of modules that we strip out of the build. # it also tries to access the network for some reason. so just disable it. @@ -320,8 +323,8 @@ ifeq (true,$(BUILD_WASM)) library/std endif ifeq (true,$(BUILD_DOCS)) - $(RUSTBUILD) doc $(RUSTBUILD_FLAGS) - $(RUSTBUILD) doc $(RUSTBUILD_FLAGS) cargo # document cargo APIs + $(RUSTBUILD_DOCS) doc $(RUSTBUILD_FLAGS) + $(RUSTBUILD_DOCS) doc $(RUSTBUILD_FLAGS) cargo # document cargo APIs endif TEST_LOG = debian/rustc-tests.log