Bug 1159371 - Allow compiling sub-directories with --disable-compile-environment. r=glandium
authorNick Alexander <nalexander@mozilla.com>
Mon, 27 Apr 2015 14:55:34 -0700
changeset 273495 df9523258590eb2fd995cc4dfe5192ced87f9478
parent 273494 6e2943f56f2f984151a3d8c1aa8280ade1257ff0
child 273496 c7440c022f74cc075ae187abe1d3f00eb343b568
push id863
push userraliiev@mozilla.com
push dateMon, 03 Aug 2015 13:22:43 +0000
treeherdermozilla-release@f6321b14228d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersglandium
bugs1159371
milestone40.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
Bug 1159371 - Allow compiling sub-directories with --disable-compile-environment. r=glandium Without this, invoking Make in a sub-directory will fail with an error that libs:: cannot find target `target'. Without this patch, the Fennec Gradle and IDE build integration fails compiling its custom targets in mobile/android/base and mobile/android/base/locales.
config/recurse.mk
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -119,17 +119,19 @@ define CREATE_SUBTIER_TRAVERSAL_RULE
 $(1):: $$(SUBMAKEFILES)
 	$$(LOOP_OVER_DIRS)
 
 endef
 
 $(foreach subtier,$(filter-out compile,$(TIERS)),$(eval $(call CREATE_SUBTIER_TRAVERSAL_RULE,$(subtier))))
 
 ifndef TOPLEVEL_BUILD
+ifdef COMPILE_ENVIRONMENT
 libs:: target host
+endif # COMPILE_ENVIRONMENT
 endif
 
 endif # ifeq ($(NO_RECURSE_MAKELEVEL),$(MAKELEVEL))
 
 endif # ifeq (.,$(DEPTH))
 
 recurse:
 	@$(RECURSED_COMMAND)