Bug 1074711 - Include m-c's baseconfig.mk check to use mozmake instead of gmake, r=glandium, a=jcranmer
--HG-- extra : amend_source : 4f93bb8381166b85b73f765fc407a1da81200e89
This commit is contained in:
Родитель
9a86ea1bb6
Коммит
29f1387d12
|
@ -3,13 +3,18 @@
|
|||
# We thus use INCLUDED_AUTOCONF_MK to enable/disable some parts depending
|
||||
# whether a normal build is happening or whether the check is running.
|
||||
|
||||
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
|
||||
# When mach wants to know if we're to use mozmake, it runs:
|
||||
# make -f topsrcdir/config/baseconfig.mk
|
||||
# The first word of MAKEFILE_LIST is the main file we're running. Grabbing the
|
||||
# parent of that directory therefore gets us the topsrcdir of comm-central,
|
||||
# whence we get the mozilla directory to run the "real" baseconfig.mk logic.
|
||||
ifndef INCLUDED_AUTOCONF_MK
|
||||
default::
|
||||
else
|
||||
include $(MOZILLA_SRCDIR)/config/baseconfig.mk
|
||||
topsrcdir := $(dir $(firstword $(MAKEFILE_LIST)))..
|
||||
endif
|
||||
|
||||
MOZILLA_SRCDIR = $(topsrcdir)/mozilla
|
||||
include $(MOZILLA_SRCDIR)/config/baseconfig.mk
|
||||
|
||||
# WIN_TOP_SRC is converted by config.mk to mozilla-central, but this needs to be comm-central.
|
||||
ifdef WIN_TOP_SRC
|
||||
WIN_TOP_SRC := $(patsubst %/mozilla,%,$(WIN_TOP_SRC))
|
||||
|
|
Загрузка…
Ссылка в новой задаче