summaryrefslogtreecommitdiffstats
path: root/toolkit/mozapps/installer
diff options
context:
space:
mode:
authorDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
committerDaniel Baumann <daniel.baumann@progress-linux.org>2024-05-15 03:35:49 +0000
commitd8bbc7858622b6d9c278469aab701ca0b609cddf (patch)
treeeff41dc61d9f714852212739e6b3738b82a2af87 /toolkit/mozapps/installer
parentReleasing progress-linux version 125.0.3-1~progress7.99u1. (diff)
downloadfirefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.tar.xz
firefox-d8bbc7858622b6d9c278469aab701ca0b609cddf.zip
Merging upstream version 126.0.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'toolkit/mozapps/installer')
-rw-r--r--toolkit/mozapps/installer/packager.mk4
1 files changed, 2 insertions, 2 deletions
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index aeba614e40..6d36d51375 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -83,14 +83,14 @@ ifdef ENABLE_MOZSEARCH_PLUGIN
cd $(topobjdir)/ && cp _build_manifests/install/dist_include '$(ABS_DIST)/$(PKG_PATH)$(MOZSEARCH_INCLUDEMAP_BASENAME).map'
@echo 'Generating mozsearch scip index...'
$(RM) $(MOZSEARCH_SCIP_INDEX_BASENAME).zip
- cp $(topsrcdir)/.cargo/config.in $(topsrcdir)/.cargo/config
+ cp $(topsrcdir)/.cargo/config.toml.in $(topsrcdir)/.cargo/config.toml
cd $(topsrcdir)/ && \
CARGO=$(MOZ_FETCHES_DIR)/rustc/bin/cargo \
RUSTC=$(MOZ_FETCHES_DIR)/rustc/bin/rustc \
$(MOZ_FETCHES_DIR)/rustc/bin/rust-analyzer scip . && \
zip -r5D '$(ABS_DIST)/$(PKG_PATH)$(MOZSEARCH_SCIP_INDEX_BASENAME).zip' \
index.scip
- rm $(topsrcdir)/.cargo/config
+ rm $(topsrcdir)/.cargo/config.toml
ifeq ($(MOZ_BUILD_APP),mobile/android)
@echo 'Generating mozsearch java/kotlin semanticdb tarball...'
$(RM) $(MOZSEARCH_JAVA_INDEX_BASENAME).zip