fix 1429875-4-61a1.patch

bug1240930-253/mozilla/1429875-4-61a1.patch

@@ -713,7 +713,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  ##############################################
  ifneq (1,$(NO_PROFILE_GUIDED_OPTIMIZE))
  ifdef MOZ_PROFILE_USE
-@@ -525,36 +527,35 @@ distclean::
+@@ -525,35 +527,35 @@ distclean::
  	$(wildcard *.$(LIB_SUFFIX)) $(wildcard *$(DLL_SUFFIX)) \
  	$(wildcard *.$(IMPORT_LIB_SUFFIX))
  
@@ -743,8 +743,8 @@ diff --git a/config/rules.mk b/config/rules.mk
  	@$(RM) $@.manifest
  ifeq (_WINNT,$(GNU_CC)_$(OS_ARCH))
 -	       $(EXPAND_LINK) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $(PROGOBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
--
 +	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
+ 
  ifdef MSMANIFEST_TOOL
  	@if test -f $@.manifest; then \
  		if test -f '$(srcdir)/$(notdir $@).manifest'; then \
@@ -752,8 +752,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  			$(MT) -NOLOGO -MANIFEST '$(win_srcdir)/$(notdir $@).manifest' $@.manifest -OUTPUTRESOURCE:$@\;1; \
  		else \
  			echo 'Embedding manifest from $@.manifest'; \
- 			$(MT) -NOLOGO -MANIFEST $@.manifest -OUTPUTRESOURCE:$@\;1; \
-@@ -565,140 +566,133 @@ ifdef MSMANIFEST_TOOL
+@@ -565,140 +567,134 @@ ifdef MSMANIFEST_TOOL
  	fi
  endif	# MSVC with manifest tool
  ifdef MOZ_PROFILE_GENERATE
@@ -763,7 +762,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  endif
  else # !WINNT || GNU_CC
 -	$(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $(PROGOBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(EXTRA_LIBS) $(OS_LIBS) $(BIN_FLAGS) $(EXE_DEF_FILE)
-+	$(call EXPAND_CC_OR_CXX,$@) -o $@ $(COMPUTED_CXX_LDFLAGS) $(PGO_CFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(STATIC_LIBS) $(MOZ_PROGRAM_LDFLAGS) $(SHARED_LIBS) $(OS_LIBS)
++	$(LINKER) -NOLOGO -OUT:$(call LINKER_OUT,$@) -PDB:$(LINK_PDBFILE) -IMPLIB:$(basename $(@F)).lib $(WIN32_EXE_LDFLAGS) $(LDFLAGS) $(MOZ_PROGRAM_LDFLAGS) $($(notdir $@)_OBJS) $(RESFILE) $(STATIC_LIBS) $(SHARED_LIBS) $(OS_LIBS)
  	$(call py_action,check_binary,--target $@)
  endif # WINNT && !GNU_CC
  
@@ -870,7 +869,7 @@ diff --git a/config/rules.mk b/config/rules.mk
 -	$(if $(filter %.$(LIB_SUFFIX),$(LIBRARY)),,$(RM) $(REAL_LIBRARY))
 -	$(EXPAND_LIBS_GEN) -o $@ $(OBJS) $(STATIC_LIBS) $(filter %.$(LIB_SUFFIX),$(EXTRA_LIBS))
 +	$(RM) $(REAL_LIBRARY)
-+	$(AR) $(AR_FLAGS) $(OBJS) $($@_OBJS)
++        $(AR) $(AR_FLAGS) $(OBJS) $($@_OBJS)
  
  ifeq ($(OS_ARCH),WINNT)
  # Import libraries are created by the rules creating shared libraries.
@@ -901,6 +900,7 @@ diff --git a/config/rules.mk b/config/rules.mk
  	$(RM) $@
  endif
 -	$(EXPAND_MKSHLIB) $(SHLIB_LDSTARTFILE) $(OBJS) $(SUB_SHLOBJS) $(RESFILE) $(LDFLAGS) $(WRAP_LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(EXTRA_LIBS) $(OS_LIBS) $(SHLIB_LDENDFILE)
++        
 +	$(MKSHLIB) $($@_OBJS) $(RESFILE) $(LDFLAGS) $(STATIC_LIBS) $(RUST_STATIC_LIB_FOR_SHARED_LIB) $(SHARED_LIBS) $(EXTRA_DSO_LDOPTS) $(MOZ_GLUE_LDFLAGS) $(OS_LIBS)
  	$(call py_action,check_binary,--target $@)
  
@@ -1358,7 +1358,26 @@ deleted file mode 100644
 diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbuild/backend/common.py
 --- a/python/mozbuild/mozbuild/backend/common.py
 +++ b/python/mozbuild/mozbuild/backend/common.py
-@@ -42,17 +42,20 @@ from mozbuild.frontend.data import (
+@@ -27,32 +27,39 @@ from mozbuild.frontend.data import (
+     Exports,
+     IPDLFile,
+     FinalTargetPreprocessedFiles,
+     FinalTargetFiles,
+     GeneratedEventWebIDLFile,
+     GeneratedSources,
+     GeneratedWebIDLFile,
+     GnProjectData,
++    HostLibrary,
++    HostRustLibrary,
+     PreprocessedTestWebIDLFile,
+     PreprocessedWebIDLFile,
++    RustLibrary,
+     SharedLibrary,
++    StaticLibrary,
+     TestWebIDLFile,
+     UnifiedSources,
+     XPIDLFile,
+     WebIDLFile,
  )
  from mozbuild.jar import (
      DeprecatedJarManifest,
@@ -1380,7 +1399,7 @@ diff --git a/python/mozbuild/mozbuild/backend/common.py b/python/mozbuild/mozbui
          self.topsrcdir = config.topsrcdir
          self.topobjdir = config.topobjdir
  
-@@ -349,16 +352,97 @@ class CommonBackend(BuildBackend):
+@@ -349,16 +356,97 @@ class CommonBackend(BuildBackend):
  
          # Write out a file listing generated sources.
          with self._write_file(mozpath.join(topobjdir, 'generated-sources.json')) as fh: