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

Merge "Prevent Kati from seeing MAKEFLAGS"

Browse Source 
am: 6b363e24bd

Change-Id: I8bc18aa66c7b621ed90d82412b6c29e72334f3f1
This commit is contained in:
Dan Willemsen
2016-09-09 01:35:51 +00:00
committed by android-build-merger
parent 4e3e6c76d0 6b363e24bd
commit 01784e0aef
1 changed files with 8 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/ninja.mk
View File

@@ -123,6 +123,14 @@ NINJA_REMOTE_NUM_JOBS ?= 500
NINJA_EXTRA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS) NINJA_EXTRA_ARGS += -j$(NINJA_REMOTE_NUM_JOBS)
else else
NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja NINJA_MAKEPARALLEL := $(MAKEPARALLEL) --ninja
# We never want Kati to see MAKEFLAGS, as forcefully overriding variables is
# terrible. The variables in MAKEFLAGS are still available in the environment,
# so if part of the build wants input from the user, it should be explicitly
# checking for an environment variable or using ?=
#
# makeparallel already clears MAKEFLAGS, so it's not necessary in the GOMA case
KATI_MAKEPARALLEL := MAKEFLAGS=
endif endif
NINJA_ARGS += $(NINJA_EXTRA_ARGS) NINJA_ARGS += $(NINJA_EXTRA_ARGS)