Revision: 20289
Author:   [email protected]
Date:     Wed Mar 26 18:23:34 2014 UTC
Log:      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
[email protected]

Review URL: https://codereview.chromium.org/212863007
http://code.google.com/p/v8/source/detail?r=20289

Modified:
 /branches/bleeding_edge/build/toolchain.gypi

=======================================
--- /branches/bleeding_edge/build/toolchain.gypi Fri Mar 21 09:28:26 2014 UTC +++ /branches/bleeding_edge/build/toolchain.gypi Wed Mar 26 18:23:34 2014 UTC
@@ -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