Bug 921770 - Avoid doing things with js/src from top-level when building --with-libxul-sdk. r=gps, a=lsblakk
authorMike Hommey <mh+mozilla@glandium.org>
Mon, 07 Oct 2013 08:38:38 -0400
changeset 161496 373bbcc04658cd26dcc4bdafe33f6cf9ea5838ff
parent 161495 5532bfeb1a1755252a3b2aebd8c14be9bb509698
child 161497 5933872ba6ba1a658463f6eb75e3e35957cf03a9
push id407
push userlsblakk@mozilla.com
push dateTue, 03 Dec 2013 03:32:50 +0000
treeherdermozilla-release@babf8c9ebc52 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersgps, lsblakk
bugs921770
milestone26.0a2
Bug 921770 - Avoid doing things with js/src from top-level when building --with-libxul-sdk. r=gps, a=lsblakk
Makefile.in
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,17 +48,19 @@ ifndef MOZ_PROFILE_USE
 # a specific subdirectory of the object directory. The invoked Python
 # script simply iterates over all the manifests, purging files as
 # necessary. To manage new directories or add files to the manifests,
 # modify the backend generator.
 #
 # We need to explicitly put backend.RecursiveMakeBackend.built here
 # otherwise the rule in rules.mk doesn't run early enough.
 libs export tools:: CLOBBER $(topsrcdir)/configure config.status backend.RecursiveMakeBackend.built
+ifndef LIBXUL_SDK
 	$(call SUBMAKE,backend.RecursiveMakeBackend.built,js/src,1)
+endif
 
 export::
 	$(call py_action,purge_manifests,-d _build_manifests/purge .)
 endif
 
 CLOBBER: $(topsrcdir)/CLOBBER
 	@echo "STOP!  The CLOBBER file has changed."
 	@echo "Please run the build through a sanctioned build wrapper, such as"
@@ -83,17 +85,17 @@ export::
 	$(RM) -r $(DIST)/sdk
 
 ifdef ENABLE_TESTS
 # Additional makefile targets to call automated test suites
 include $(topsrcdir)/testing/testsuite-targets.mk
 endif
 
 export::
-	$(call py_action,process_install_manifest,$(DIST)/include _build_manifests/install/dist_include js/src/_build_manifests/install/dist_include)
+	$(call py_action,process_install_manifest,$(DIST)/include _build_manifests/install/dist_include $(if $(LIBXUL_SDK),,js/src/_build_manifests/install/dist_include))
 
 default all::
 	$(call BUILDSTATUS,TIERS export compile libs tools)
 
 include $(topsrcdir)/config/rules.mk
 
 distclean::
 	$(RM) $(DIST_GARBAGE)
@@ -188,16 +190,18 @@ endif
 
 # Look for R_386_PC32 relocations in shared libs, these
 # break x86_64 builds and SELinux users.
 ifeq ($(OS_TARGET)_$(TARGET_XPCOM_ABI),Linux_x86-gcc3)
 scheck::
 	@relcount=`find $(DIST)/bin -name "*.so" | xargs objdump -R | grep R_386_PC32 | wc -l` && if test $$relcount -gt 0; then echo "FAILED: R_386_PC32 relocations detected in a shared library.  Did you use a system header without adding it to config/system-headers?"; exit 1; else echo "PASSED"; fi
 endif
 
+ifndef LIBXUL_SDK
 js/src/Makefile: subsrcdir := js/src
 
 ifdef ENABLE_TESTS
 # Incorporate static tier directories into tests. This should be incorporated
 # into moz.build files someday.
 check::
 	$(call SUBMAKE,$@,js/src)
 endif
+endif