author | Mike Hommey <mh+mozilla@glandium.org> |
Tue, 01 Oct 2013 08:25:38 +0900 | |
changeset 149378 | 4f64e01f2e98df3579d6b312c80c80e7b9c8dc06 |
parent 149377 | 0b568f6afca0bae9e284be1d8dfd6c0fc01d735f |
child 149379 | 3393dcd916949bf707b664ec19ae91d8b37c47cb |
push id | 34538 |
push user | mh@glandium.org |
push date | Mon, 30 Sep 2013 23:27:08 +0000 |
treeherder | mozilla-inbound@3393dcd91694 [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | gps |
bugs | 921770 |
milestone | 27.0a1 |
first release with | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
last release without | nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
|
Makefile.in | file | annotate | diff | comparison | revisions |
--- a/Makefile.in +++ b/Makefile.in @@ -28,17 +28,20 @@ DIST_GARBAGE = config.cache config.log c config/autoconf.mk \ mozilla-config.h \ netwerk/necko-config.h xpcom/xpcom-config.h xpcom/xpcom-private.h \ .mozconfig.mk ifndef MOZ_PROFILE_USE # 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 js-config-status +libs export tools:: CLOBBER $(topsrcdir)/configure config.status backend.RecursiveMakeBackend.built +ifndef LIBXUL_SDK +libs export tools:: js-config-status +endif endif CLOBBER: $(topsrcdir)/CLOBBER @echo "STOP! The CLOBBER file has changed." @echo "Please run the build through a sanctioned build wrapper, such as" @echo "'mach build' or client.mk." @exit 1 @@ -51,35 +54,40 @@ CLOBBER: $(topsrcdir)/CLOBBER config.status: $(topsrcdir)/configure @echo "STOP! configure has changed and needs to be run in this build directory." @echo "Please rerun configure." @echo "To ignore this message, touch 'config.status' in the build directory," @echo "but your build might not succeed." @exit 1 +ifndef LIBXUL_SDK .PHONY: js-config-status js-config-status: $(call SUBMAKE,backend.RecursiveMakeBackend.built,js/src,1) +endif install_manifests := bin idl include public private sdk install_manifest_depends = \ CLOBBER \ $(topsrcdir)/configure \ config.status \ backend.RecursiveMakeBackend.built \ - js-config-status \ $(NULL) +ifndef LIBXUL_SDK +install_manifest_depends += js-config-status +endif + .PHONY: install-manifests install-manifests: $(addprefix install-dist-,$(install_manifests)) .PHONY: $(addprefix install-dist-,$(install_manifests)) $(addprefix install-dist-,$(install_manifests)): install-dist-%: $(install_manifest_depends) - $(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$(DIST)/$* _build_manifests/install/dist_$* js/src/_build_manifests/install/dist_$*) + $(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )$(DIST)/$* _build_manifests/install/dist_$* $(if $(LIBXUL_SDK),,js/src/_build_manifests/install/dist_$*)) .PHONY: install-tests install-manifests: install-tests install-tests: $(install_manifest_depends) $(call py_action,process_install_manifest,$(if $(NO_REMOVE),--no-remove )_tests _build_manifests/install/tests js/src/_build_manifests/install/tests) # _tests should be purged during cleaning. However, we don't want it purged @@ -211,23 +219,25 @@ 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 ifdef MOZ_PSEUDO_DERECURSE # Interdependencies for parallel export. js/xpconnect/src/export: dom/bindings/export accessible/src/xpcom/export: xpcom/xpidl/export js/src/export: mfbt/export endif +endif