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

Unified Diff: build/config/BUILDCONFIG.gn

Issue 2119653002: Remove the clang hacks for the CrOS GN toolchains. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: put assert back in Created 4 years, 6 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 | « no previous file | build/toolchain/cros/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/BUILDCONFIG.gn
diff --git a/build/config/BUILDCONFIG.gn b/build/config/BUILDCONFIG.gn
index 79197d7d0c72dbea893a476d24e3a53739cda08f..49b6d52d95f60085c5024920ca3cdce9db565f76 100644
--- a/build/config/BUILDCONFIG.gn
+++ b/build/config/BUILDCONFIG.gn
@@ -204,14 +204,9 @@ if (target_os == "android") {
_default_toolchain = "//build/toolchain/android:$target_cpu"
}
} else if (target_os == "chromeos") {
- # See comments in build/toolchain/cros/BUILD.gn about board compiles.
assert(host_os == "linux",
"ChromeOS builds are only supported on Linux hosts.")
- if (is_clang) {
- _default_toolchain = "//build/toolchain/cros:clang_target"
- } else {
- _default_toolchain = "//build/toolchain/cros:target"
- }
+ _default_toolchain = "//build/toolchain/cros:target"
} else if (target_os == "ios") {
_default_toolchain = "//build/toolchain/mac:ios_clang_$target_cpu"
} else if (target_os == "linux") {
« no previous file with comments | « no previous file | build/toolchain/cros/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698