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

Unified Diff: build/common.gypi

Issue 411633003: Don't use clang by default when cross building for ARM/linux. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 5 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: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index 58a1bf24cf67d6a7586e70039e11371f94576819..71f1b062203b6ca921160b4a508ef17a4985fe0b 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1780,7 +1780,7 @@
# the class names, so the JNI generator needs to know this.
'jni_generator_jarjar_file': '../android_webview/build/jarjar-rules.txt',
}],
- ['OS=="linux" and target_arch!="mipsel"', {
+ ['OS=="linux" and target_arch!="mipsel" and target_arch!="arm"', {
Mark Seaborn 2014/07/22 22:23:31 Does this affect Chrome OS, or do they set the com
Nico 2014/07/22 22:25:00 I made the chromeos chrome.ebuild explicitly set c
# TODO(thakis): This is here to measure perf for a while.
'clang%': 1,
}], # OS=="mac"
@@ -4268,6 +4268,16 @@
'-Wl,--disable-new-dtags',
],
}],
+ ['gcc_version>=46 and gcc_version<48 and clang==0', {
Mark Seaborn 2014/07/22 22:23:31 Can you add some comments here? I can't really te
+ 'target_conditions': [
+ ['_toolset=="target"', {
+ 'cflags_cc': [
+ '-std=gnu++0x',
+ '-fpermissive',
+ ],
+ }],
+ ],
+ }],
['gcc_version>=48 and clang==0', {
'target_conditions': [
['_toolset=="target"', {
« 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