summaryrefslogtreecommitdiff
path: root/chromium/build/toolchain/toolchain.gni
diff options
context:
space:
mode:
Diffstat (limited to 'chromium/build/toolchain/toolchain.gni')
-rw-r--r--chromium/build/toolchain/toolchain.gni7
1 files changed, 6 insertions, 1 deletions
diff --git a/chromium/build/toolchain/toolchain.gni b/chromium/build/toolchain/toolchain.gni
index ebb98fe416a..949aa09f4be 100644
--- a/chromium/build/toolchain/toolchain.gni
+++ b/chromium/build/toolchain/toolchain.gni
@@ -48,7 +48,12 @@ hermetic_xcode_path =
declare_args() {
if (is_clang) {
# Clang compiler version. Clang files are placed at version-dependent paths.
- clang_version = "6.0.0"
+ if (llvm_force_head_revision) {
+ clang_version = "7.0.0"
+ } else {
+ # TODO(hans): Trunk was updated; remove after the next roll.
+ clang_version = "6.0.0"
+ }
}
}