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

build/common.gypi

 # Copyright (c) 2009 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     # .gyp files should set chromium_code to 1 if they build Chromium-specific
     # code, as opposed to external code.  This variable is used to control
     # such things as the set of warnings to enable, and whether warnings are
     # treated as errors.
@@ skipping 32 matching lines @@
     # Once all vsprops settings are migrated into gyp, this can go away.
     'msvs_use_common_release%': 1,
 
     # TODO(sgk): eliminate this if possible.
     # It would be nicer to support this via a setting in 'target_defaults'
     # in chrome/app/locales/locales.gypi overriding the setting in the
     # 'Debug' configuration in the 'target_defaults' dict below,
     # 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,
 
     # By default we assume that we are building as part of Chrome
     'nacl_standalone%': 0,
   },
   'target_defaults': {
     'include_dirs': [
       '../..',
     ],
@@ skipping 592 matching lines @@
     # settings in target dicts.  SYMROOT is a special case, because many other
     # Xcode variables depend on it, including variables such as
     # PROJECT_DERIVED_FILE_DIR.  When a source group corresponding to something
     # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
     # files to appear (when present) in the UI as actual files and not red
     # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
     # and therefore SYMROOT, needs to be set at the project level.
     'SYMROOT': '<(DEPTH)/xcodebuild',
   },
 }