From def92d1b8e9d373e2f6f27c366d578d97d8960c6 Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Wed, 15 May 2024 05:34:50 +0200 Subject: Merging upstream version 126.0. Signed-off-by: Daniel Baumann --- config/recurse.mk | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'config/recurse.mk') diff --git a/config/recurse.mk b/config/recurse.mk index a2e10e6a18..6afad04c2e 100644 --- a/config/recurse.mk +++ b/config/recurse.mk @@ -202,15 +202,15 @@ endif $(addprefix build/unix/stdc++compat/,target host) build/clang-plugin/host: config/export # Rust targets, and export targets that run cbindgen need -# $topobjdir/.cargo/config to be preprocessed first. Ideally, we'd only set it +# $topobjdir/.cargo/config.toml to be preprocessed first. Ideally, we'd only set it # as a dependency of the rust targets, but unfortunately, that pushes Make to # execute them much later than we'd like them to be when the file doesn't exist # prior to Make running. So we also set it as a dependency of pre-export, which # ensures it exists before recursing the rust targets and the export targets # that run cbindgen, tricking Make into keeping them early. -$(rust_targets): $(DEPTH)/.cargo/config +$(rust_targets): $(DEPTH)/.cargo/config.toml ifndef TEST_MOZBUILD -recurse_pre-export: $(DEPTH)/.cargo/config +recurse_pre-export: $(DEPTH)/.cargo/config.toml endif endif -- cgit v1.2.3