author | Gregory Szorc <gps@mozilla.com> |
Mon, 13 Nov 2017 14:38:40 -0800 | |
changeset 446081 | a88781c8655a63e602b46db80d0ff141f8cab9b4 |
parent 446080 | 7ffce7d50018208119d937c48f99c108b501b397 |
child 446082 | ee45241c58eb84dbc37c6a2ecb37187876e922d7 |
push id | 1648 |
push user | mtabara@mozilla.com |
push date | Thu, 01 Mar 2018 12:45:47 +0000 |
treeherder | mozilla-release@cbb9688c2eeb [default view] [failures only] |
perfherder | [talos] [build metrics] [platform microbench] (compared to previous push) |
reviewers | nalexander |
bugs | 1416052 |
milestone | 59.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
|
--- a/client.mk +++ b/client.mk @@ -32,26 +32,16 @@ ifeq "$(CWD)" "/" CWD := /. endif PYTHON ?= $(shell which python2.7 > /dev/null 2>&1 && echo python2.7 || echo python) CONFIG_GUESS := $(shell $(TOPSRCDIR)/build/autoconf/config.guess) #################################### -# Sanity checks - -# Windows checks. -ifneq (,$(findstring mingw,$(CONFIG_GUESS))) - -# Set this for baseconfig.mk -HOST_OS_ARCH=WINNT -endif - -#################################### # Load mozconfig Options # See build pages, http://www.mozilla.org/build/ for how to set up mozconfig. define CR endef @@ -111,19 +101,16 @@ OBJDIR_TARGETS = install export libs cle # The default rule is build build:: ifndef MACH $(error client.mk must be used via `mach`. Try running \ `./mach $(firstword $(MAKECMDGOALS) $(.DEFAULT_GOAL))`) endif -# Include baseconfig.mk for its $(MAKE) validation. -include $(TOPSRCDIR)/config/baseconfig.mk - # Define mkdir include $(TOPSRCDIR)/config/makefiles/makeutils.mk include $(TOPSRCDIR)/config/makefiles/autotargets.mk # For now, only output "export" lines and lines containing UPLOAD_EXTRA_FILES # from mach environment --format=client.mk output. MOZCONFIG_MK_LINES := $(filter export||% UPLOAD_EXTRA_FILES% %UPLOAD_EXTRA_FILES%,$(MOZCONFIG_OUT_LINES)) $(OBJDIR)/.mozconfig.mk: $(TOPSRCDIR)/client.mk $(FOUND_MOZCONFIG) $(call mkdir_deps,$(OBJDIR)) $(OBJDIR)/CLOBBER