AuroraMiddleware/v8
1
0
Fork 0
Code Issues 2 Pull Requests Releases Wiki Activity

Not set -m32 flag when compiling with Android ARM compiler.

Browse Source 
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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12630 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
This commit is contained in:
jkummerow@chromium.org 2012-09-28 14:38:59 +00:00
parent 6fd0e69156
commit 45f16dba6a
1 changed files with 7 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
build/common.gypi
View File

@ -302,9 +302,14 @@
['_toolset=="target"', { ['_toolset=="target"', {
'variables': { 'variables': {
'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)', 'm32flag': '<!((echo | $(echo ${CXX_target:-${CXX:-$(which g++)}}) -m32 -E - > /dev/null 2>&1) && echo "-m32" || true)',
'clang%': 0,
}, },
'cflags': [ '<(m32flag)' ], 'conditions': [
'ldflags': [ '<(m32flag)' ], ['OS!="android" or clang==1', {
'cflags': [ '<(m32flag)' ],
'ldflags': [ '<(m32flag)' ],
}],
],
'xcode_settings': { 'xcode_settings': {
'ARCHS': [ 'i386' ], 'ARCHS': [ 'i386' ],
}, },