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

Unified Diff: build/config/compiler/BUILD.gn

Issue 1307653008: Fix more aspects of the NaCl build configs. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: add more clarifying comments about NaCl and the -std flag Created 5 years, 3 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 | « .gn ('k') | build/toolchain/nacl/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/config/compiler/BUILD.gn
diff --git a/build/config/compiler/BUILD.gn b/build/config/compiler/BUILD.gn
index e7af924c4dc5703a2ea49ce18f1444b829262161..9cc689c54616b2014872c4622580f9051ee29a88 100644
--- a/build/config/compiler/BUILD.gn
+++ b/build/config/compiler/BUILD.gn
@@ -522,13 +522,17 @@ config("compiler") {
# C++11 compiler flags setup.
# ---------------------------
- if (is_linux || is_android || is_nacl) {
+ if (is_linux || is_android || (is_nacl && is_clang)) {
Nico 2015/09/05 01:03:20 I still don't understand this change. Why is this
Dirk Pranke 2015/09/05 01:37:20 the clang-based NaCl toolchains understand this fl
# gnu++11 instead of c++11 is needed because some code uses typeof() (a
# GNU extension).
# TODO(thakis): Eventually switch this to c++11 instead,
# http://crbug.com/427584
cflags_cc += [ "-std=gnu++11" ]
- } else if (!is_win) {
+ } else if (!is_win && !is_nacl) {
+ # TODO(mcgrathr) - the NaCl GCC toolchain doesn't support either gnu++11
+ # or c++11; we technically don't need this toolchain any more, but there
+ # are still a few buildbots using it, so until those are turned off
+ # we need the !is_nacl clause and the (is_nacl && is_clang) clause, above.
cflags_cc += [ "-std=c++11" ]
}
« no previous file with comments | « .gn ('k') | build/toolchain/nacl/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698