Skip to content

Commit 2a16784

Browse files
authored
Shift RBE remote wrapper flag from config file to command line flag (#841)
The relative path in the config file is incorrect if the working directory is not directly nested under `out/`, as will happen with flutter/engine#51474.
1 parent 092e19a commit 2a16784

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

build/toolchain/mac/BUILD.gn

+3-3
Original file line numberDiff line numberDiff line change
@@ -28,12 +28,12 @@ if (use_goma) {
2828
objc_prefix = "$goma_dir/gomacc "
2929
link_prefix = "$goma_dir/gomacc "
3030
} else if (use_rbe) {
31+
remote_wrapper =
32+
rebase_path("//flutter/build/rbe/remote_wrapper.sh", root_build_dir)
3133
compiler_args = rewrapper_command + [
34+
"--remote_wrapper=$remote_wrapper",
3235
"--labels=type=compile,compiler=clang,lang=cpp ",
3336
]
34-
link_args = rewrapper_command + [
35-
"--labels=type=link,tool=clang ",
36-
]
3737
cxx_prefix = string_join(" ", compiler_args)
3838
# RBE does not support objc out of the box.
3939
objc_prefix = ""

0 commit comments

Comments
 (0)