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

Unified Diff: tools.gyp

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, 5 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/untrusted.gypi ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: tools.gyp
diff --git a/tools.gyp b/tools.gyp
index d46051165a7be87670018a640ae05d2b036bacdf..bebeb9dff61edcaea62311c694299b12373e67d1 100644
--- a/tools.gyp
+++ b/tools.gyp
@@ -34,10 +34,14 @@
'prep_nacl_sdk',
],
'conditions': [
- ['target_arch=="ia32" or target_arch=="x64"', {
+ ['target_arch=="ia32" or (target_arch=="x64" and OS=="win")', {
'dependencies': [
'crt_init_32',
'crt_fini_32',
+ ],
+ }],
+ ['(target_arch=="ia32" and OS=="win") or target_arch=="x64"', {
+ 'dependencies': [
'crt_init_64',
'crt_fini_64',
],
@@ -245,7 +249,7 @@
},
],
'conditions': [
- ['target_arch=="ia32" or target_arch=="x64"', {
+ ['(target_arch=="ia32" and OS=="win") or target_arch=="x64"', {
'targets' : [
{
'target_name': 'crt_init_64',
@@ -297,7 +301,7 @@
}
],
}],
- ['target_arch=="ia32" or target_arch=="x64"', {
+ ['target_arch=="ia32" or (target_arch=="x64" and OS=="win")', {
'targets' : [
{
'target_name': 'crt_init_32',
« no previous file with comments | « build/untrusted.gypi ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698