Revision: 12630
Author: [email protected]
Date: Fri Sep 28 07:38:59 2012
Log: Not set -m32 flag when compiling with Android ARM compiler.
We are removing CXX_target environment variables and only use the
make_global_settings to select compiler in chromium Android.
BUG=143889
Review URL: https://codereview.chromium.org/10990070
http://code.google.com/p/v8/source/detail?r=12630
Modified:
/branches/bleeding_edge/build/common.gypi
=======================================
--- /branches/bleeding_edge/build/common.gypi Fri Sep 14 00:41:55 2012
+++ /branches/bleeding_edge/build/common.gypi Fri Sep 28 07:38:59 2012
@@ -302,9 +302,14 @@
['_toolset=="target"', {
'variables': {
'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which
g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
+ 'clang%': 0,
},
- 'cflags': [ '<(m32flag)' ],
- 'ldflags': [ '<(m32flag)' ],
+ 'conditions': [
+ ['OS!="android" or clang==1', {
+ 'cflags': [ '<(m32flag)' ],
+ 'ldflags': [ '<(m32flag)' ],
+ }],
+ ],
'xcode_settings': {
'ARCHS': [ 'i386' ],
},
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
