Changing target_arch selection in nacl to match chrome....

build/common.gypi

Index: build/common.gypi
===================================================================
--- build/common.gypi	(revision 889)
+++ build/common.gypi	(working copy)
@@ -50,8 +50,24 @@
     # but that doesn't work as we'd like.
     'msvs_debug_link_incremental%': '2',
 
+    # Doing this in a sub-dict so that it can be referred to below.
     # The architecture that we're building for (x86, arm).
-    'target_arch%': 'ia32',
+    'variables': {
+      # Compute the architecture that we're building for. Default to the
+      # architecture that we're building on.
+      'conditions': [
+        [ 'OS=="linux"', {
+          # This handles the Linux platforms we generally deal with. Anything
+          # else gets passed through, which probably won't work very well; such
+          # hosts should pass an explicit target_arch to gyp.
+          'target_arch%':
+            '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.*/arm/")'

[gregoryd, 2009/10/21 20:15:07]

Will it still work with GYP_DEFINES? I think it's required to build arm binaries
on Linux.

[bradn, 2009/10/21 20:23:50]

Yes it will still work with GYP_DEFINES.

+        }, {  # OS!="linux"
+          'target_arch%': 'ia32',
+        }],
+      ],
+    },
+    'target_arch%': '<(target_arch)',

[gregoryd, 2009/10/21 20:15:07]

gyp question: when <(target_arch) is referred below, which one will be used?

[bradn, 2009/10/21 20:23:50]

This will use the one from the variables section above, unless overidden with
GYP_DEFINES.

 
     'linux2%': 0,