StrixOS/build
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Only pass NINJA_ARGS to the main ninja compile"

Browse Source
This commit is contained in:
Treehugger Robot
2016-05-06 01:11:39 +00:00
committed by Gerrit Code Review
parent b60b340597 9a97ba700b
commit 374c7facd5
2 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
core/ninja.mk
View File

@@ -104,13 +104,15 @@ ifeq (,$(NINJA_STATUS))
NINJA_STATUS := [%p %s/%t]$(space) NINJA_STATUS := [%p %s/%t]$(space)
endif endif
NINJA_EXTRA_ARGS :=
ifneq (,$(filter showcommands,$(ORIGINAL_MAKECMDGOALS))) ifneq (,$(filter showcommands,$(ORIGINAL_MAKECMDGOALS)))
NINJA_ARGS += "-v" NINJA_EXTRA_ARGS += "-v"
endif endif
# Make multiple rules to generate the same target an error instead of # Make multiple rules to generate the same target an error instead of
# proceeding with undefined behavior. # proceeding with undefined behavior.
NINJA_ARGS += -w dupbuild=err NINJA_EXTRA_ARGS += -w dupbuild=err
ifdef USE_GOMA ifdef USE_GOMA
KATI_MAKEPARALLEL := $(MAKEPARALLEL) KATI_MAKEPARALLEL := $(MAKEPARALLEL)
@@ -118,11 +120,13 @@ KATI_MAKEPARALLEL := $(MAKEPARALLEL)
# this parallelism. Note the parallelism of all other jobs is still # this parallelism. Note the parallelism of all other jobs is still
# limited by the -j flag passed to GNU make. # limited by the -j flag passed to GNU make.
NINJA_REMOTE_NUM_JOBS ?= 500 NINJA_REMOTE_NUM_JOBS ?= 500
NINJA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS) NINJA_EXTRA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS)
else else
NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja
endif endif
NINJA_ARGS += $(NINJA_EXTRA_ARGS)
ifeq ($(USE_SOONG),true) ifeq ($(USE_SOONG),true)
COMBINED_BUILD_NINJA := $(OUT_DIR)/combined$(KATI_NINJA_SUFFIX).ninja COMBINED_BUILD_NINJA := $(OUT_DIR)/combined$(KATI_NINJA_SUFFIX).ninja

2
core/soong.mk
View File

@@ -79,4 +79,4 @@ $(SOONG_IN_MAKE):
# prebuilts. # prebuilts.
.PHONY: run_soong .PHONY: run_soong
run_soong: $(SOONG_BOOTSTRAP) $(SOONG_VARIABLES) $(SOONG_IN_MAKE) FORCE run_soong: $(SOONG_BOOTSTRAP) $(SOONG_VARIABLES) $(SOONG_IN_MAKE) FORCE
$(hide) $(SOONG) $(SOONG_BUILD_NINJA) $(NINJA_ARGS) $(hide) $(SOONG) $(SOONG_BUILD_NINJA) $(NINJA_EXTRA_ARGS)