commit a37a517b5419c4faf1799b0b2b9b6a559ee6af4d
author borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 09 20:44:32 2012 +0000
committer borenet@google.com <borenet@google.com@2bbb7eff-a529-9590-31e7-b0007b416f81> Thu Aug 09 20:44:32 2012 +0000
tree 7dd00459f6d3b7c8d865da8a39f960cb42fffe3a
parent aaa3aec09b3907a4985967a73a1ff76fa3cce97a

Enable 32/64-bit gyp switch on Linux

Linux defaults to 64, other platforms 32.  As of this change, only Mac and
Linux are affected by the skia_arch_width flag.  Next step is to make Win
work as well.
Review URL: https://codereview.appspot.com/6460066

git-svn-id: http://skia.googlecode.com/svn/trunk@5041 2bbb7eff-a529-9590-31e7-b0007b416f81

gyp/common_conditions.gypi

diff --git a/gyp/common_conditions.gypi b/gyp/common_conditions.gypi
index 143e854..2b9800f 100644
--- a/gyp/common_conditions.gypi
+++ b/gyp/common_conditions.gypi
@@ -111,6 +111,24 @@
           '-Wno-unused-parameter',
           '-Wno-c++11-extensions'
         ],
+        'conditions' : [
+          ['skia_arch_width == 64', {
+            'cflags': [
+              '-m64',
+            ],
+            'ldflags': [
+              '-m64',
+            ],
+          }],
+          ['skia_arch_width == 32', {
+            'cflags': [
+              '-m32',
+            ],
+            'ldflags': [
+              '-m32',
+            ],
+          }],
+        ],
         'include_dirs' : [
           '/usr/include/freetype2',
         ],