Commit 3cce853a authored by Coroiu Cristina's avatar Coroiu Cristina
Browse files

Backed out 4 changesets (bug 1641291) for build bustages and SM failures on a CLOSED TREE 

Backed out changeset 9c0a44614576 (bug 1641291)
Backed out changeset 0dcf604b880e (bug 1641291)
Backed out changeset d830bee40b5c (bug 1641291)
Backed out changeset fe38c82c2dad (bug 1641291)
parent 93fd46b2

Makefile.in

+2 −2
Original line number Diff line number Diff line
@@ -98,7 +98,7 @@ ifneq (,$(filter FasterMake+RecursiveMake,$(BUILD_BACKENDS))) 
	@# same directory, because that would blow up

	$(if $(wildcard _build_manifests/install/$(subst /,_,$*)),$(if $(wildcard faster/install_$(subst /,_,$*)*),$(error FasterMake and RecursiveMake ends of the hybrid build system want to handle $*)))

endif

	$(addprefix $(call py_action,process_install_manifest,$(if $(filter copy,$(NSDISTMODE)),--no-symlinks )--track install_$(subst /,_,$*).track $*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))

	$(addprefix $(call py_action,process_install_manifest,--track install_$(subst /,_,$*).track $*) ,$(wildcard _build_manifests/install/$(subst /,_,$*)))



# Dummy wrapper rule to allow the faster backend to piggy back

$(addprefix install-,$(subst /,_,$(filter dist/%,$(install_manifests)))): install-dist_%: install-dist/% ;
@@ -108,7 +108,7 @@ install-tests: install-test-files 


.PHONY: install-test-files

install-test-files:

	$(call py_action,process_install_manifest,$(if $(filter copy,$(NSDISTMODE)),--no-symlinks )--track install__test_files.track _tests _build_manifests/install/_test_files)

	$(call py_action,process_install_manifest,--track install__test_files.track _tests _build_manifests/install/_test_files)



include $(topsrcdir)/build/moz-automation.mk

build/moz.configure/toolchain.configure

+2 −2
Original line number Diff line number Diff line
@@ -2127,9 +2127,9 @@ set_config('LINKER_KIND', select_linker.KIND) 


@depends_if(select_linker, macos_sdk)

def linker_ldflags(linker, macos_sdk):

    flags = list((linker and linker.LINKER_FLAG) or [])

    flags = list(linker.LINKER_FLAG or [])

    if macos_sdk:

        if linker and linker.KIND == 'ld64':

        if linker.KIND == 'ld64':

            flags.append('-Wl,-syslibroot,%s' % macos_sdk)

        else:

            flags.append('-Wl,--sysroot=%s' % macos_sdk)

config/faster/rules.mk

+0 −1
Original line number Diff line number Diff line
@@ -88,7 +88,6 @@ $(addprefix install-,$(INSTALL_MANIFESTS)): install-%: $(addprefix $(TOPOBJDIR)/ 
	@# support for defines tracking in process_install_manifest.

	@touch install_$(subst /,_,$*)

	$(PYTHON3) -m mozbuild.action.process_install_manifest \

		$(if $(filter copy,$(NSDISTMODE)),--no-symlinks) \

		--track install_$(subst /,_,$*).track \

		$(TOPOBJDIR)/$* \

		-DAB_CD=en-US \

config/rules.mk

+13 −13
Original line number Diff line number Diff line
@@ -649,28 +649,28 @@ $(OBJS) $(HOST_OBJS) $(PROGOBJS) $(HOST_PROGOBJS): $(GLOBAL_DEPS) 
# Rules for building native targets must come first because of the host_ prefix

$(HOST_COBJS):

	$(REPORT_BUILD_VERBOSE)

	$(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CFLAGS) $(NSPR_CFLAGS) -- $<

	$(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CFLAGS) $(NSPR_CFLAGS) $<



$(HOST_CPPOBJS):

	$(REPORT_BUILD_VERBOSE)

	$(call BUILDSTATUS,OBJECT_FILE $@)

	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(NSPR_CFLAGS) -- $<

	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(NSPR_CFLAGS) $<



$(HOST_CMOBJS):

	$(REPORT_BUILD_VERBOSE)

	$(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CFLAGS) $(HOST_CMFLAGS) $(NSPR_CFLAGS) -- $<

	$(HOST_CC) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CFLAGS) $(HOST_CMFLAGS) $(NSPR_CFLAGS) $<



$(HOST_CMMOBJS):

	$(REPORT_BUILD_VERBOSE)

	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(NSPR_CFLAGS) -- $<

	$(HOST_CXX) $(HOST_OUTOPTION)$@ -c $(HOST_CPPFLAGS) $(HOST_CXXFLAGS) $(HOST_CMMFLAGS) $(NSPR_CFLAGS) $<



$(COBJS):

	$(REPORT_BUILD_VERBOSE)

	$(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(CC) $(OUTOPTION)$@ -c $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) $<



$(CWASMOBJS):

	$(REPORT_BUILD_VERBOSE)

	$(WASM_CC) $(OUTOPTION)$@ -c $(WASM_CFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(WASM_CC) $(OUTOPTION)$@ -c $(WASM_CFLAGS) $($(notdir $<)_FLAGS) $<



WINEWRAP = $(if $(and $(filter %.exe,$1),$(WINE)),$(WINE) $1,$1)
@@ -745,7 +745,7 @@ $(SOBJS): 
$(CPPOBJS):

	$(REPORT_BUILD_VERBOSE)

	$(call BUILDSTATUS,OBJECT_FILE $@)

	$(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(CCC) $(OUTOPTION)$@ -c $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $<



$(CPPWASMOBJS):

	$(REPORT_BUILD_VERBOSE)
@@ -754,27 +754,27 @@ $(CPPWASMOBJS): 


$(CMMOBJS):

	$(REPORT_BUILD_VERBOSE)

	$(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(CCC) -o $@ -c $(COMPILE_CXXFLAGS) $(COMPILE_CMMFLAGS) $($(notdir $<)_FLAGS) $<



$(CMOBJS):

	$(REPORT_BUILD_VERBOSE)

	$(CC) -o $@ -c $(COMPILE_CFLAGS) $(COMPILE_CMFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(CC) -o $@ -c $(COMPILE_CFLAGS) $(COMPILE_CMFLAGS) $($(notdir $<)_FLAGS) $<



$(filter %.s,$(CPPSRCS:%.cpp=%.s)): %.s: %.cpp $(call mkdir_deps,$(MDDEPDIR))

	$(REPORT_BUILD_VERBOSE)

	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $<



$(filter %.s,$(CPPSRCS:%.cc=%.s)): %.s: %.cc $(call mkdir_deps,$(MDDEPDIR))

	$(REPORT_BUILD_VERBOSE)

	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $<



$(filter %.s,$(CPPSRCS:%.cxx=%.s)): %.s: %.cpp $(call mkdir_deps,$(MDDEPDIR))

	$(REPORT_BUILD_VERBOSE)

	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(CCC) -S $(COMPILE_CXXFLAGS) $($(notdir $<)_FLAGS) $<



$(filter %.s,$(CSRCS:%.c=%.s)): %.s: %.c $(call mkdir_deps,$(MDDEPDIR))

	$(REPORT_BUILD_VERBOSE)

	$(CC) -S $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) -- $<

	$(CC) -S $(COMPILE_CFLAGS) $($(notdir $<)_FLAGS) $<



ifneq (,$(filter %.i,$(MAKECMDGOALS)))

# Call as $(call _group_srcs,extension,$(SRCS)) - this will create a list

js/src/build/Makefile.in

+1 −1
Original line number Diff line number Diff line
@@ -58,7 +58,7 @@ install:: ../js-config.h 
#



install::

	$(call py_action,process_install_manifest,$(if $(filter copy,$(NSDISTMODE)),--no-symlinks )--track install_dist_include.track --no-symlinks $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME) $(DEPTH)/_build_manifests/install/dist_include)

	$(call py_action,process_install_manifest,--track install_dist_include.track --no-symlinks $(DESTDIR)$(includedir)/$(JS_LIBRARY_NAME) $(DEPTH)/_build_manifests/install/dist_include)



#

# END SpiderMonkey header installation