Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(190)

Unified Diff: build/common.gypi

Issue 271113: Default to building for the same architecture as the build host. (Closed)
Patch Set: comments Created 11 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/common.gypi
diff --git a/build/common.gypi b/build/common.gypi
index b5af77ac16eaf2e9d4312582823f5066b3d4b7cb..bd11ee49c800df0db2a72061109aec65d5e0455e 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.
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698