@@ -423,7 +423,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
423
423
$(LINKER) -OUT:$@ -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
424
424
else # !WINNT || GNU_CC
425
425
$(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $($(notdir $@)_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
426
- $(call py_action,check_binary,$@)
426
+ $(call py_action,check_binary $(@F) ,$@)
427
427
endif # WINNT && !GNU_CC
428
428
429
429
ifdef ENABLE_STRIP
@@ -468,7 +468,7 @@ ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
468
468
$(LINKER) -out:$@ -pdb:$(LINK_PDBFILE) $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
469
469
else
470
470
$(call EXPAND_CC_OR_CXX,$@) $(COMPUTED_CXX_LDFLAGS) -o $@ $($@_OBJS) $(filter %.res,$^) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
471
- $(call py_action,check_binary,$@)
471
+ $(call py_action,check_binary $(@F) ,$@)
472
472
endif # WINNT && !GNU_CC
473
473
474
474
ifdef ENABLE_STRIP
@@ -624,7 +624,7 @@ define syms_template
624
624
syms:: $(2 )
625
625
$(2 ) : $(1 )
626
626
ifdef MOZ_CRASHREPORTER
627
- $$(call py_action,dumpsymbols,$$(abspath $$<) $$(abspath $$@) $$(DUMP_SYMBOLS_FLAGS))
627
+ $$(call py_action,dumpsymbols $$@ ,$$(abspath $$<) $$(abspath $$@) $$(DUMP_SYMBOLS_FLAGS))
628
628
ifeq ($(OS_ARCH ) ,WINNT)
629
629
ifdef WINCHECKSEC
630
630
$$(PYTHON3) $$(topsrcdir)/build/win32/autowinchecksec.py $$<
@@ -864,7 +864,7 @@ endif
864
864
endif
865
865
866
866
misc realchrome :: $(FINAL_TARGET ) /chrome
867
- $(call py_action,jar_maker,\
867
+ $(call py_action,jar_maker $( subst $( topsrcdir ) /,, $( JAR_MANIFEST ) ) ,\
868
868
$(QUIET ) -d $(FINAL_TARGET ) \
869
869
$(MAKE_JARS_FLAGS ) $(DEFINES ) $(ACDEFINES ) \
870
870
$(JAR_MANIFEST ) )
@@ -882,7 +882,7 @@ endif
882
882
ifneq ($(XPI_PKGNAME ) ,)
883
883
tools realchrome ::
884
884
@echo ' Packaging $(XPI_PKGNAME).xpi...'
885
- $(call py_action,zip,-C $(FINAL_TARGET ) ../$(XPI_PKGNAME ) .xpi '* ')
885
+ $(call py_action,zip $( XPI_PKGNAME ) .xpi ,-C $(FINAL_TARGET ) ../$(XPI_PKGNAME ) .xpi '* ')
886
886
endif
887
887
888
888
# ############################################################################
@@ -1049,7 +1049,7 @@ PP_TARGETS_ALL_RESULTS := $(sort $(foreach tier,$(PP_TARGETS_TIERS),$(PP_TARGETS
1049
1049
$(PP_TARGETS_ALL_RESULTS ) :
1050
1050
$(if $(filter-out $(notdir $@ ) ,$(notdir $(<:.in= ) ) ) ,$(error Looks like $@ has an unexpected dependency on $< which breaks PP_TARGETS) )
1051
1051
$(RM ) ' $@'
1052
- $(call py_action,preprocessor,--depend $(MDDEPDIR ) /$(@F ) .pp $(PP_TARGET_FLAGS ) $(DEFINES ) $(ACDEFINES ) '$< ' -o '$@ ')
1052
+ $(call py_action,preprocessor $( @F ) ,--depend $(MDDEPDIR ) /$(@F ) .pp $(PP_TARGET_FLAGS ) $(DEFINES ) $(ACDEFINES ) '$< ' -o '$@ ')
1053
1053
1054
1054
$(filter % .css,$(PP_TARGETS_ALL_RESULTS ) ) : PP_TARGET_FLAGS+=--marker %
1055
1055
0 commit comments