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' ], |
}, |