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

Unified Diff: trunk/src/build/common.gypi

Issue 15059011: Revert 198920 "clang: Turn on C++11 on CrOs too." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 7 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 | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: trunk/src/build/common.gypi
===================================================================
--- trunk/src/build/common.gypi (revision 198923)
+++ trunk/src/build/common.gypi (working copy)
@@ -3061,7 +3061,7 @@
'-mfpmath=sse',
],
}],
- ['clang==1 and OS!="android"', {
+ ['clang==1 and (OS!="android" and chromeos!=1)', {
# Turn on C++11.
'cflags': [
# This warns on using ints as initializers for floats in
@@ -3082,7 +3082,7 @@
'-std=gnu++11',
],
}],
- ['clang==1 and OS=="android"', {
+ ['clang==1 and (OS=="android" or chromeos==1)', {
# Android uses gcc4.4, and clang isn't compatible with gcc4.4's
# libstdc++ in C++11 mode. So no C++11 mode for Android yet.
# Doesn't work with asan for some reason either: crbug.com/233464
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698