From bcc2f8bd13fc502b8f74faf81fb11d589b51596b Mon Sep 17 00:00:00 2001 From: Nick Alexander Date: Mon, 27 Apr 2015 14:55:34 -0700 Subject: [PATCH] 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 | 2 ++ 1 file changed, 2 insertions(+) diff --git a/config/recurse.mk b/config/recurse.mk index 8a0a5a7bdf9..bd22bbe7222 100644 --- a/config/recurse.mk +++ b/config/recurse.mk @@ -124,7 +124,9 @@ 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))