From cae0d0c98cd4e9d5ba8e330b1339811a36490521 Mon Sep 17 00:00:00 2001
From: Mike Hommey <mh+mozilla@glandium.org>
Date: Tue, 10 Mar 2015 15:16:51 +0900
Subject: [PATCH] Bug 1063880 - Allow a --disable-compile-environment to go
 through a full mach build. r=mshal

---
 Makefile.in                            | 4 ++++
 config/Makefile.in                     | 2 +-
 config/recurse.mk                      | 2 ++
 dom/plugins/test/testaddon/Makefile.in | 2 ++
 4 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/Makefile.in b/Makefile.in
index 6d16962b0926..ee49503acc66 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -40,10 +40,12 @@ ifndef MOZ_PROFILE_USE
 $(TIERS) binaries:: CLOBBER $(configure_dir)/configure config.status backend.RecursiveMakeBackend
 ifndef JS_STANDALONE
 ifndef LIBXUL_SDK
+ifdef COMPILE_ENVIRONMENT
 $(TIERS) binaries:: $(topsrcdir)/js/src/configure js/src/config.status
 endif
 endif
 endif
+endif
 
 ifdef JS_STANDALONE
 .PHONY: CLOBBER
@@ -105,12 +107,14 @@ install_manifest_depends = \
 
 ifndef JS_STANDALONE
 ifndef LIBXUL_SDK
+ifdef COMPILE_ENVIRONMENT
 install_manifest_depends += \
   $(topsrcdir)/js/src/configure \
   js/src/config.status \
   $(NULL)
 endif
 endif
+endif
 
 .PHONY: install-manifests
 install-manifests: $(addprefix install-,$(install_manifests))
diff --git a/config/Makefile.in b/config/Makefile.in
index 5fe023964b2c..e73d3a0ce3a1 100644
--- a/config/Makefile.in
+++ b/config/Makefile.in
@@ -18,10 +18,10 @@ include $(topsrcdir)/config/config.mk
 
 # L10n jobs are doing make -C config manually before anything else,
 # and need nsinstall to be built as a consequence.
+ifdef COMPILE_ENVIRONMENT
 export:: host
 
 ifneq (WINNT,$(HOST_OS_ARCH))
-ifdef COMPILE_ENVIRONMENT
 # Ensure nsinstall is atomically created
 nsinstall$(HOST_BIN_SUFFIX): $(HOST_PROGRAM)
 	cp $^ $@.tmp
diff --git a/config/recurse.mk b/config/recurse.mk
index d073a7dad419..21831a6d8e65 100644
--- a/config/recurse.mk
+++ b/config/recurse.mk
@@ -96,10 +96,12 @@ $(addsuffix /$(CURRENT_TIER),$(filter-out config,$(CURRENT_DIRS))): config/$(CUR
 # is done with the config/host target. Note the config/host target only exists if
 # nsinstall is actually built, which it is not on Windows, because we use
 # nsinstall.py there.
+ifdef COMPILE_ENVIRONMENT
 ifneq (,$(filter config/host, $(compile_targets)))
 $(addsuffix /$(CURRENT_TIER),$(CURRENT_DIRS)): config/host
 endif
 endif
+endif
 
 endif # ifeq ($(CURRENT_TIER),compile)
 
diff --git a/dom/plugins/test/testaddon/Makefile.in b/dom/plugins/test/testaddon/Makefile.in
index c57e88c00242..063d56a41509 100644
--- a/dom/plugins/test/testaddon/Makefile.in
+++ b/dom/plugins/test/testaddon/Makefile.in
@@ -16,8 +16,10 @@ endif
 testdir = $(abspath $(DEPTH)/_tests/xpcshell/dom/plugins/test/unit/)
 addonpath = $(testdir)/$(addon_file_name)
 
+ifdef COMPILE_ENVIRONMENT
 libs::
 	$(NSINSTALL) -D $(testdir)
 	rm -f $(addonpath)
 	cd $(srcdir) && zip -rD $(addonpath) install.rdf
 	cd $(DIST) && zip -rD $(addonpath) $(foreach name,$(plugin_file_names),plugins/$(name))
+endif