AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

v8: Always use clang_ for v8_snapshot_toolchain

Browse Source 
This is a no-op in practice because clang_ was previously only
not used if `is_chromeos && !is_clang`, but all CrOS builds use
clang nowadays.

Bug: None
Change-Id: Ife7fa1bb2cf99107136a5fa5155dd611ed83b8e9
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/4012059
Reviewed-by: Michael Achenbach <machenbach@chromium.org>
Auto-Submit: Nico Weber <thakis@chromium.org>
Commit-Queue: Michael Achenbach <machenbach@chromium.org>
Cr-Commit-Position: refs/heads/main@{#84107}
This commit is contained in:
Nico Weber 2022-11-08 01:13:32 +00:00 committed by V8 LUCI CQ
parent 88be9a05cc
commit cb25ca93e6
1 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gni/snapshot_toolchain.gni
View File

@ -71,14 +71,7 @@ if (v8_snapshot_toolchain == "") {
"//build/toolchain/${host_os}:clang_arm64_v8_$v8_current_cpu" "//build/toolchain/${host_os}:clang_arm64_v8_$v8_current_cpu"
} else if (host_cpu == "x64") { } else if (host_cpu == "x64") {
# This is a cross-compile from an x64 host to either a non-Intel target # This is a cross-compile from an x64 host to either a non-Intel target
# cpu or a different target OS. Clang will always be used by default on the # cpu or a different target OS.
# host, unless this is a ChromeOS build, in which case the same toolchain
# (Clang or GCC) will be used for target and host by default.
if (is_chromeos && !is_clang) {
_clang = ""
} else {
_clang = "clang_"
}
if (v8_current_cpu == "x64" || v8_current_cpu == "x86") { if (v8_current_cpu == "x64" || v8_current_cpu == "x86") {
_cpus = v8_current_cpu _cpus = v8_current_cpu
@ -100,7 +93,7 @@ if (v8_snapshot_toolchain == "") {
} }
if (_cpus != "") { if (_cpus != "") {
v8_snapshot_toolchain = "//build/toolchain/${host_os}:${_clang}${_cpus}" v8_snapshot_toolchain = "//build/toolchain/${host_os}:clang_${_cpus}"
} else if (is_win && v8_current_cpu == "arm64") { } else if (is_win && v8_current_cpu == "arm64") {
# cross compile Windows arm64 with host toolchain. # cross compile Windows arm64 with host toolchain.
v8_snapshot_toolchain = host_toolchain v8_snapshot_toolchain = host_toolchain