mozilla
/
releases-comm-central
зеркало из https://github.com/mozilla/releases-comm-central.git
1
0
Форкнуть 0
Код Задачи Пакеты Проекты Релизы Вики Активность

Bug 1282590 - Minor client.mk tweaks to sync with m-c. r=mkmelin

This commit is contained in:
aleth 2016-06-29 12:07:26 +02:00
Родитель acd1c676fb
Коммит 1618151501
1 изменённых файлов: 4 добавлений и 1 удалений
Показать статистику Скачать Patch файл Скачать Diff файл Показать все файлы Свернуть все файлы

5
client.mk
Просмотреть файл

@ -50,7 +50,6 @@ endif
ifndef TOPSRCDIR ifndef TOPSRCDIR
ifeq (,$(wildcard client.mk)) ifeq (,$(wildcard client.mk))
TOPSRCDIR := $(patsubst %/,%,$(dir $(MAKEFILE_LIST))) TOPSRCDIR := $(patsubst %/,%,$(dir $(MAKEFILE_LIST)))
MOZ_OBJDIR = .
else else
TOPSRCDIR := $(CWD) TOPSRCDIR := $(CWD)
endif endif
@ -102,6 +101,8 @@ endef
MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell MOZ_PGO=$(MOZ_PGO) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/'))) MOZCONFIG_CONTENT := $(subst ||,$(CR),$(subst || ,$(CR),$(shell MOZ_PGO=$(MOZ_PGO) $(TOPSRCDIR)/$(MOZCONFIG_LOADER) $(TOPSRCDIR) | sed 's/$$/||/')))
$(eval $(MOZCONFIG_CONTENT)) $(eval $(MOZCONFIG_CONTENT))
export FOUND_MOZCONFIG
# As '||' was used as a newline separator, it means it's not occurring in # As '||' was used as a newline separator, it means it's not occurring in
# lines themselves. It can thus safely be used to replaces normal spaces, # lines themselves. It can thus safely be used to replaces normal spaces,
# to then replace newlines with normal spaces. This allows to get a list # to then replace newlines with normal spaces. This allows to get a list
@ -111,6 +112,8 @@ MOZCONFIG_OUT_LINES := $(subst $(CR), ,$(subst $(NULL) $(NULL),||,$(MOZCONFIG_CO
START_COMMENT = \# START_COMMENT = \#
MOZCONFIG_OUT_FILTERED := $(filter-out $(START_COMMENT)%,$(MOZCONFIG_OUT_LINES)) MOZCONFIG_OUT_FILTERED := $(filter-out $(START_COMMENT)%,$(MOZCONFIG_OUT_LINES))
export MOZ_PGO
# Automatically add -jN to make flags if not defined. N defaults to number of cores. # Automatically add -jN to make flags if not defined. N defaults to number of cores.
ifeq (,$(findstring -j,$(MOZ_MAKE_FLAGS))) ifeq (,$(findstring -j,$(MOZ_MAKE_FLAGS)))
cores=$(shell $(PYTHON) -c 'import multiprocessing; print(multiprocessing.cpu_count())') cores=$(shell $(PYTHON) -c 'import multiprocessing; print(multiprocessing.cpu_count())')