[infra] Bump reclient and don't RBE on gcc.

This is a no-op since RBE is not enabled anywhere yet.

Bug: b/296994239
Change-Id: I2d39419736fca0382a6082f6be64e787348bb825
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/336440
Reviewed-by: William Hesse <whesse@google.com>
Commit-Queue: Jonas Termansen <sortie@google.com>
This commit is contained in:
Jonas Termansen 2023-11-15 16:47:49 +00:00 committed by Commit Queue
parent 3c456ccbd2
commit 6a08407c6f
2 changed files with 23 additions and 19 deletions

2
DEPS
View file

@ -82,7 +82,7 @@ vars = {
# https://chrome-infra-packages.appspot.com/p/gn/gn
"gn_version": "git_revision:e4702d7409069c4f12d45ea7b7f0890717ca3f4b",
"reclient_version": "git_revision:81e819b39d4743462857cc55430d898b9fcca1af",
"reclient_version": "git_revision:f75cfb7bca0c04516330f27867a855e8d1186677",
# Update from https://chrome-infra-packages.appspot.com/p/fuchsia/sdk/core
"fuchsia_sdk_version": "version:16.20231105.3.1",

View file

@ -22,6 +22,7 @@ if (use_goma) {
assembler_prefix = "$goma_dir/gomacc "
compiler_prefix = "$goma_dir/gomacc "
link_prefix = "$goma_dir/gomacc "
gcc_compiler_prefix = compiler_prefix
} else if (use_rbe) {
assert(!use_goma)
rewrapper_args = [
@ -36,14 +37,17 @@ if (use_goma) {
assembler_prefix = string_join(" ", assembler_args)
compiler_prefix = string_join(" ", compiler_args)
link_prefix = string_join(" ", link_args)
gcc_compiler_prefix = ""
} else if (use_ccache) {
assembler_prefix = "ccache "
compiler_prefix = "ccache "
link_prefix = "ccache "
gcc_compiler_prefix = compiler_prefix
} else {
assembler_prefix = ""
compiler_prefix = ""
link_prefix = ""
gcc_compiler_prefix = compiler_prefix
}
# Google's clang does not work for alpine, use alpine's system clang
@ -63,9 +67,9 @@ gcc_toolchain("arm") {
prefix = arm_toolchain_prefix
}
cc = "${compiler_prefix}${prefix}gcc"
cxx = "${compiler_prefix}${prefix}g++"
asm = "${assembler_prefix}${prefix}gcc"
cc = "${gcc_compiler_prefix}${prefix}gcc"
cxx = "${gcc_compiler_prefix}${prefix}g++"
asm = "${gcc_compiler_prefix}${prefix}gcc"
ar = "${prefix}ar"
ld = "${link_prefix}${prefix}g++"
@ -101,9 +105,9 @@ gcc_toolchain("arm64") {
prefix = arm64_toolchain_prefix
}
cc = "${compiler_prefix}${prefix}gcc"
cxx = "${compiler_prefix}${prefix}g++"
asm = "${assembler_prefix}${prefix}gcc"
cc = "${gcc_compiler_prefix}${prefix}gcc"
cxx = "${gcc_compiler_prefix}${prefix}g++"
asm = "${gcc_compiler_prefix}${prefix}gcc"
ar = "${prefix}ar"
ld = "${link_prefix}${prefix}g++"
@ -155,9 +159,9 @@ gcc_toolchain("x86") {
if (ia32_toolchain_prefix != "") {
prefix = ia32_toolchain_prefix
}
cc = "${compiler_prefix}${prefix}gcc"
cxx = "${compiler_prefix}${prefix}g++"
asm = "${assembler_prefix}${prefix}gcc"
cc = "${gcc_compiler_prefix}${prefix}gcc"
cxx = "${gcc_compiler_prefix}${prefix}g++"
asm = "${gcc_compiler_prefix}${prefix}gcc"
readelf = "${prefix}readelf"
nm = "${prefix}nm"
@ -192,9 +196,9 @@ gcc_toolchain("x64") {
if (x64_toolchain_prefix != "") {
prefix = x64_toolchain_prefix
}
cc = "${compiler_prefix}${prefix}gcc"
cxx = "${compiler_prefix}${prefix}g++"
asm = "${assembler_prefix}${prefix}gcc"
cc = "${gcc_compiler_prefix}${prefix}gcc"
cxx = "${gcc_compiler_prefix}${prefix}g++"
asm = "${gcc_compiler_prefix}${prefix}gcc"
readelf = "${prefix}readelf"
nm = "${prefix}nm"
@ -213,9 +217,9 @@ gcc_toolchain("riscv32") {
prefix = riscv32_toolchain_prefix
}
cc = "${compiler_prefix}${prefix}gcc"
cxx = "${compiler_prefix}${prefix}g++"
asm = "${assembler_prefix}${prefix}gcc"
cc = "${gcc_compiler_prefix}${prefix}gcc"
cxx = "${gcc_compiler_prefix}${prefix}g++"
asm = "${gcc_compiler_prefix}${prefix}gcc"
ar = "${prefix}ar"
ld = "${link_prefix}${prefix}g++"
@ -251,9 +255,9 @@ gcc_toolchain("riscv64") {
prefix = riscv64_toolchain_prefix
}
cc = "${compiler_prefix}${prefix}gcc"
cxx = "${compiler_prefix}${prefix}g++"
asm = "${assembler_prefix}${prefix}gcc"
cc = "${gcc_compiler_prefix}${prefix}gcc"
cxx = "${gcc_compiler_prefix}${prefix}g++"
asm = "${gcc_compiler_prefix}${prefix}gcc"
ar = "${prefix}ar"
ld = "${link_prefix}${prefix}g++"