From 45f16dba6acc51a9ab8726c2c27591cd27e734bd Mon Sep 17 00:00:00 2001
From: "jkummerow@chromium.org"
 <jkummerow@chromium.org@ce2b1a6d-e550-0410-aec6-3dcde31c8c00>
Date: Fri, 28 Sep 2012 14:38:59 +0000
Subject: [PATCH] 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

git-svn-id: http://v8.googlecode.com/svn/branches/bleeding_edge@12630 ce2b1a6d-e550-0410-aec6-3dcde31c8c00
---
 build/common.gypi | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/build/common.gypi b/build/common.gypi
index 89a02b6e5d..125809db52 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -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' ],
             },