nagai/fune
3
0
Fork 0
forked from mirrors/gecko-dev
Code Pull requests Activity

Bug 1884770 - Fix RUST_PROGRAMS-related rules on Windows r=firefox-build-system-reviewers,glandium

Browse source 
Account for long path prefixes.

Differential Revision: https://phabricator.services.mozilla.com/D204295
This commit is contained in:
Alex 2024-03-19 12:40:21 +00:00
parent 3ed1a9c810
commit fc141d95e9
1 changed files with 5 additions and 3 deletions
repo.diff.show_diff_stats Download patch file Download diff file Expand all files Collapse all files

8
config/makefiles/rust.mk
View file

@ -148,7 +148,9 @@ endif # MOZ_CODE_COVERAGE
endif # WINNT endif # WINNT
ifeq (WINNT,$(HOST_OS_ARCH)) ifeq (WINNT,$(HOST_OS_ARCH))
normalize_sep = $(subst \,/,$(1)) # //?/ is the long path prefix which seems to confuse make, so we remove it
# (things should work without it).
normalize_sep = $(patsubst //?/%,%,$(subst \,/,$(1)))
else else
normalize_sep = $(1) normalize_sep = $(1)
endif endif
@ -467,12 +469,12 @@ endef
# spaces with some unlikely string for the foreach, and replace them back in the # spaces with some unlikely string for the foreach, and replace them back in the
# loop itself. # loop itself.
define make_cargo_rule define make_cargo_rule
$(notdir $(1))_deps := $$(wordlist 2, 10000000, $$(if $$(wildcard $(basename $(1)).d),$$(shell cat $(basename $(1)).d))) $(notdir $(1))_deps := $$(call normalize_sep,$$(wordlist 2, 10000000, $$(if $$(wildcard $(basename $(1)).d),$$(shell cat $(basename $(1)).d))))
$(1): $(CARGO_FILE) $(3) $(topsrcdir)/Cargo.lock $$(if $$($(notdir $(1))_deps),$$($(notdir $(1))_deps),$(2)) $(1): $(CARGO_FILE) $(3) $(topsrcdir)/Cargo.lock $$(if $$($(notdir $(1))_deps),$$($(notdir $(1))_deps),$(2))
$$(REPORT_BUILD) $$(REPORT_BUILD)
$$(if $$($(notdir $(1))_deps),+$(MAKE) $(2),:) $$(if $$($(notdir $(1))_deps),+$(MAKE) $(2),:)
$$(foreach dep, $$(call normalize_sep,$$(subst \ ,_^_^_^_,$$($(notdir $(1))_deps))),$$(eval $$(call make_default_rule,$$(subst _^_^_^_,\ ,$$(dep))))) $$(foreach dep, $$(subst \ ,_^_^_^_,$$($(notdir $(1))_deps)),$$(eval $$(call make_default_rule,$$(subst _^_^_^_,\ ,$$(dep)))))
endef endef
ifdef RUST_LIBRARY_FILE ifdef RUST_LIBRARY_FILE