From 55d5c4b9dffe5e59eb6b019c1a930ec9ada47e10 Mon Sep 17 00:00:00 2001 From: Cosmin Sabou Date: Tue, 4 Apr 2023 16:48:15 +0300 Subject: [PATCH] Backed out changeset 8725bf468d29 (bug 1808184) for breaking incremental builds (bug 1826114). a=backout --- config/makefiles/rust.mk | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/config/makefiles/rust.mk b/config/makefiles/rust.mk index f9124a0484d0..1f4023b89e4a 100644 --- a/config/makefiles/rust.mk +++ b/config/makefiles/rust.mk @@ -437,10 +437,7 @@ force-cargo-library-build: $(REPORT_BUILD) $(call CARGO_BUILD) --lib $(cargo_target_flag) $(rust_features_flag) -- $(cargo_rustc_flags) -RUST_LIBRARY_DEP_FILE := $(patsubst %.a,%.d,$(RUST_LIBRARY_FILE)) -RUST_LIBRARY_DEPS := $(wordlist 2, 10000000, $(if $(wildcard $(RUST_LIBRARY_DEP_FILE)),$(shell cat $(RUST_LIBRARY_DEP_FILE)))) -$(RUST_LIBRARY_FILE): $(CARGO_FILE) $(if $(RUST_LIBRARY_DEPS),$(RUST_LIBRARY_DEPS), force-cargo-library-build) - $(if $(RUST_LIBRARY_DEPS),+$(MAKE) force-cargo-library-build,:) +$(RUST_LIBRARY_FILE): force-cargo-library-build # When we are building in --enable-release mode; we add an additional check to confirm # that we are not importing any networking-related functions in rust code. This reduces # the chance of proxy bypasses originating from rust code.