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

Unified Diff: build/common.gypi

Issue 10990070: Not set -m32 flag when compiling with Android ARM compiler. (Closed) Base URL: http://git.chromium.org/external/v8.git@master
Patch Set: Created 8 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 | « 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 fdf4d9c3076163ada147cef15f05e5084f251c5c..d18f410a879e1d44204649db1de3278fac9cf839 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -303,8 +303,12 @@
'variables': {
'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
},
- 'cflags': [ '<(m32flag)' ],
- 'ldflags': [ '<(m32flag)' ],
+ 'conditions': [
+ [ 'OS!="android" or clang==1', {
Jakob Kummerow 2012/09/28 14:38:33 |clang| is not defined when building outside of Ch
+ 'cflags': [ '<(m32flag)' ],
Jakob Kummerow 2012/09/28 14:38:33 nit: indentation
+ 'ldflags': [ '<(m32flag)' ],
+ }],
+ ],
'xcode_settings': {
'ARCHS': [ 'i386' ],
},
« 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