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

Unified Diff: build/untrusted.gypi

Issue 366763003: Only build the x86 arches we actually need. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: fix Created 6 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 | « build/nacl_core_sdk.gyp ('k') | tools.gyp » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: build/untrusted.gypi
diff --git a/build/untrusted.gypi b/build/untrusted.gypi
index 3ef7aabc88036079b2cb3ccb1cef6879ffbe6f3d..aefa12da7a5265eb5ee4f35cd2461907a853f40c 100755
--- a/build/untrusted.gypi
+++ b/build/untrusted.gypi
@@ -179,7 +179,7 @@
},
},
}],
- ['target_arch=="ia32" or target_arch=="x64"', {
+ ['(target_arch=="ia32" and OS=="win") or target_arch=="x64"', {
'target_defaults': {
# x86-64 newlib nexe action
'target_conditions': [
@@ -363,6 +363,13 @@
},
],
}],
+ ],
+ },
+ }],
+ ['target_arch=="ia32" or (target_arch=="x64" and OS=="win")', {
Mark Seaborn 2014/07/22 17:40:27 64-bit Windows Chrome builds don't need to include
+ 'target_defaults': {
+ # x86-64 newlib nexe action
binji 2014/07/02 18:49:10 bad comment
+ 'target_conditions': [
# x86-32 newlib nexe action
['nexe_target!="" and build_newlib!=0 and enable_x86_32!=0', {
'variables': {
« no previous file with comments | « build/nacl_core_sdk.gyp ('k') | tools.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698