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

Merge "Allow USE_GOMA=true without explicit USE_NINJA=true"

Browse Source
This commit is contained in:
Shinichiro Hamaji
2015-09-25 04:23:28 +00:00
committed by Gerrit Code Review
parent c180dd0bfc d8f268ecac
commit 6b37c7b32a
1 changed files with 8 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
core/goma.mk
View File

@@ -16,13 +16,14 @@
# Notice: this works only with Google's Goma build infrastructure. # Notice: this works only with Google's Goma build infrastructure.
ifneq ($(USE_GOMA),) ifneq ($(USE_GOMA),)
# Check if USE_NINJA is defined because GNU make won't work well # Check if USE_NINJA is not false because GNU make won't work well
# with goma. Note this file is evaluated twice, once with # with goma. Note this file is evaluated twice, once by GNU make and
# USE_NINJA=true by GNU make and once with USE_NINJA=false by kati # once by kati with USE_NINJA=false. We do this check in the former
# which is invoked by GNU make. So, we cannot test the value of # pass.
# USE_NINJA. ifndef KATI
ifndef USE_NINJA ifeq ($(USE_NINJA),false)
$(error USE_GOMA=true works only with USE_NINJA=true) $(error USE_GOMA=true is not compatible with USE_NINJA=false)
endif
endif endif
# Goma requires a lot of processes and file descriptors. # Goma requires a lot of processes and file descriptors.