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

Unified Diff: build/common_global.gypi

Issue 2851003: Provide a default definition of the target_arch variable on Linux to... (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/o3d/
Patch Set: '' Created 10 years, 6 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_global.gypi
===================================================================
--- build/common_global.gypi (revision 49739)
+++ build/common_global.gypi (working copy)
@@ -14,6 +14,13 @@
[ 'OS == "linux"', {
'use_system_zlib': 0,
'use_system_libjpeg': 0,
+ 'nacl_standalone': 1,
+ # nacl_standalone=1 is broken because nacl's build/common.gypi
+ # insists on building 32-bit. Force target_arch to be defined
+ # so that nacl's override isn't used.
+ # Note: this variable setting is copied from nacl's
+ # build/common.gypi so that it has the exact same semantics.
+ 'target_arch%': '<!(uname -m | sed -e "s/i.86/ia32/;s/x86_64/x64/;s/arm.*/arm/")'
}],
[ 'OS == "win"', {
'nacl_standalone': 1,
« 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