зеркало из https://github.com/mozilla/gecko-dev.git
Bug 1416052 - Remove make validation from client.mk; r=nalexander
MozbuildObject._run_make() also invokes baseconfig.mk as part of validating the make binary that will be executed. Since mach calls this Python code and mach is now required to invoke client.mk, the validation in client.mk is redundant and can be removed. autoconf.mk includes baseconfig.mk. So even once we eliminate client.mk, the make backend itself will still validate make. We should probably move this validation to moz.configure (if it isn't already there). But that can be done another time. MozReview-Commit-ID: DPCBdz253S6 --HG-- extra : rebase_source : 8588738c517bd636039555299095981c71722600
This commit is contained in:
Родитель
6440692f13
Коммит
bf68f14cc2
13
client.mk
13
client.mk
|
@ -36,16 +36,6 @@ PYTHON ?= $(shell which python2.7 > /dev/null 2>&1 && echo python2.7 || echo pyt
|
|||
|
||||
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
|
||||
|
||||
|
@ -116,9 +106,6 @@ $(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
|
||||
|
|
Загрузка…
Ссылка в новой задаче