Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(3212)

Unified Diff: build/toolchain/toolchain.gni

Issue 2708203002: Roll clang 289944:295762. (Closed)
Patch Set: cros Created 3 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « build/config/compiler/BUILD.gn ('k') | chrome/browser/chromeos/login/session/user_session_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/toolchain/toolchain.gni
diff --git a/build/toolchain/toolchain.gni b/build/toolchain/toolchain.gni
index 5722c125d0073196a0476e37541ecf9f9493aa9e..6eb3c9080393b1b80c79650257bcdd0b5dd745d9 100644
--- a/build/toolchain/toolchain.gni
+++ b/build/toolchain/toolchain.gni
@@ -50,12 +50,7 @@ hermetic_xcode_path =
declare_args() {
if (is_clang) {
# Clang compiler version. Clang files are placed at version-dependent paths.
- if (llvm_force_head_revision) {
- clang_version = "5.0.0"
- } else {
- # TODO(thakis): Remove this branch the next time clang rolls.
- clang_version = "4.0.0"
- }
+ clang_version = "5.0.0"
}
}
« no previous file with comments | « build/config/compiler/BUILD.gn ('k') | chrome/browser/chromeos/login/session/user_session_manager.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698