From 521240186735d7f63fbd5ec2b420f7ad170c565b Mon Sep 17 00:00:00 2001
From: "mmoss@chromium.org"
 <mmoss@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Fri, 16 Oct 2009 00:53:59 +0000
Subject: Default to building for the same architecture as the build host.

BUG=24766

Review URL: http://codereview.chromium.org/271113


git-svn-id: svn://svn.chromium.org/chrome/trunk/src@29230 0039d316-1c4b-4281-b951-d872f2087c98
---
 build/common.gypi | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/build/common.gypi b/build/common.gypi
index b5af77a..bd11ee4 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -35,8 +35,19 @@
       # builds).
       'buildtype%': 'Dev',
 
-      # The architecture that we're building on.
-      'target_arch%': 'ia32',
+      # 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/")'
+        }, {  # OS!="linux"
+          'target_arch%': 'ia32',
+        }],
+      ],
 
       # We do want to build Chromium with Breakpad support in certain
       # situations. I.e. for Chrome bot.
-- 
cgit v1.1