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

Merge "Add RBE_CXX_COMPARE variable to locally disable compare mode for C++" into rvc-dev

Browse Source
This commit is contained in:
Kousik Kumar
2020-09-14 14:25:29 +00:00
committed by Android (Google) Code Review
parent d0737f00ee 2dcf402edc
commit f65ffea114
1 changed files with 7 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
core/rbe.mk
View File

@@ -28,6 +28,12 @@ ifneq ($(filter-out false,$(USE_RBE)),)
cxx_rbe_exec_strategy := "local" cxx_rbe_exec_strategy := "local"
endif endif
ifdef RBE_CXX_COMPARE
cxx_compare := $(RBE_CXX_COMPARE)
else
cxx_compare := "false"
endif
ifdef RBE_JAVAC_EXEC_STRATEGY ifdef RBE_JAVAC_EXEC_STRATEGY
javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY) javac_exec_strategy := $(RBE_JAVAC_EXEC_STRATEGY)
else else
@@ -51,7 +57,7 @@ ifneq ($(filter-out false,$(USE_RBE)),)
java_r8_d8_platform := $(platform)",Pool=java16" java_r8_d8_platform := $(platform)",Pool=java16"
RBE_WRAPPER := $(rbe_dir)/rewrapper RBE_WRAPPER := $(rbe_dir)/rewrapper
RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform="$(cxx_platform)" RBE_CXX := --labels=type=compile,lang=cpp,compiler=clang --env_var_whitelist=PWD --exec_strategy=$(cxx_rbe_exec_strategy) --platform="$(cxx_platform)" --compare="$(cxx_compare)"
# Append rewrapper to existing *_WRAPPER variables so it's possible to # Append rewrapper to existing *_WRAPPER variables so it's possible to
# use both ccache and rewrapper. # use both ccache and rewrapper.