Reviewers: ulan,

Message:
Ulan, ptal. Thanks.

Description:
Modify toolchain.gypi to avoid adding -m64 flag on android.

The -m64 flag isn't supported on Android. Add a similar gyp condition to avoid setting the flag on Android in a similar manner to how the -m32 flag is avoided
on android.

BUG=354405
LOG=N

Please review this at https://codereview.chromium.org/212863007/

SVN Base: https://v8.googlecode.com/svn/branches/bleeding_edge

Affected files (+6, -2 lines):
  M build/toolchain.gypi


Index: build/toolchain.gypi
diff --git a/build/toolchain.gypi b/build/toolchain.gypi
index 5783529abcf36a4eb34bc30d73e998547432e1d0..4a70d6f7a719cdc6c39859996ed1a4f48cbbccca 100644
--- a/build/toolchain.gypi
+++ b/build/toolchain.gypi
@@ -428,8 +428,12 @@
             'variables': {
'm64flag': '<!(($(echo ${CXX_target:-<(CXX)}) -m64 -E - > /dev/null 2>&1 < /dev/null) && echo "-m64" || true)',
             },
-            'cflags': [ '<(m64flag)' ],
-            'ldflags': [ '<(m64flag)' ],
+            'conditions': [
+              ['((OS!="android" and OS!="qnx") or clang==1)', {
+                'cflags': [ '<(m64flag)' ],
+                'ldflags': [ '<(m64flag)' ],
+              }],
+            ],
           }]
         ],
       }],


--
--
v8-dev mailing list
[email protected]
http://groups.google.com/group/v8-dev
--- You received this message because you are subscribed to the Google Groups "v8-dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email 
to [email protected].
For more options, visit https://groups.google.com/d/optout.

Reply via email to