Bug 1416052 - Remove OBJDIR_TARGETS; r=nalexander
authorGregory Szorc <gps@mozilla.com>
Thu, 09 Nov 2017 23:31:36 -0800
changeset 446091 d7c5faf9f301505325b4a88b6831c72db2b1adbb
parent 446090 2a90d49c5573711b4c1f56558147eef124ca9131
child 446092 b19b455ae87a23f8e9a84b9541f01dfbe20ed8e8
push id1648
push usermtabara@mozilla.com
push dateThu, 01 Mar 2018 12:45:47 +0000
treeherdermozilla-release@cbb9688c2eeb [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersnalexander
bugs1416052
milestone59.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 1416052 - Remove OBJDIR_TARGETS; r=nalexander Now that we require mach to run client.mk and mach only invokes client.mk for full builds (the "build" target) and configure (the "configure" target), we should no longer have anyone using client.mk as a proxy to make targets in the build backend. So remove that feature. MozReview-Commit-ID: BbaMdZHnRXy
client.mk
--- a/client.mk
+++ b/client.mk
@@ -76,19 +76,16 @@ endif
 endif
 
 MOZ_MAKE = $(MAKE) $(MOZ_MAKE_FLAGS) -C $(OBJDIR)
 
 # 'configure' scripts generated by autoconf.
 CONFIGURES := $(TOPSRCDIR)/configure
 CONFIGURES += $(TOPSRCDIR)/js/src/configure
 
-# Make targets that are going to be passed to the real build system
-OBJDIR_TARGETS = install export libs clean realclean distclean upload sdk installer package package-compare stage-package source-package l10n-check automation/build
-
 #######################################################################
 # Rules
 
 # The default rule is build
 build::
 
 ifndef MACH
 $(error client.mk must be used via `mach`. Try running \
@@ -221,35 +218,27 @@ ifneq (,$(CONFIG_STATUS))
 endif
 
 ####################################
 # Build it
 
 build::  $(OBJDIR)/Makefile $(OBJDIR)/config.status
 	+$(MOZ_MAKE)
 
-####################################
-# Other targets
-
-# Pass these target onto the real build system
-$(OBJDIR_TARGETS):: $(OBJDIR)/Makefile $(OBJDIR)/config.status
-	+$(MOZ_MAKE) $@
-
 ifdef MOZ_AUTOMATION
 build::
-	$(MAKE) -f $(TOPSRCDIR)/client.mk automation/build
+	+$(MOZ_MAKE) automation/build
 endif
 
 ifdef MOZBUILD_MANAGE_SCCACHE_DAEMON
 build::
 	# Terminate sccache server. This prints sccache stats.
 	-$(MOZBUILD_MANAGE_SCCACHE_DAEMON) --stop-server
 endif
 
 # This makefile doesn't support parallel execution. It does pass
 # MOZ_MAKE_FLAGS to sub-make processes, so they will correctly execute
 # in parallel.
 .NOTPARALLEL:
 
 .PHONY: \
     build \
-    configure \
-    $(OBJDIR_TARGETS)
+    configure