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

Side by Side 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, 4 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « build/untrusted.gypi ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 4
5 { 5 {
6 ###################################################################### 6 ######################################################################
7 'includes': [ 7 'includes': [
8 'build/common.gypi', 8 'build/common.gypi',
9 ], 9 ],
10 ###################################################################### 10 ######################################################################
(...skipping 16 matching lines...) Expand all
27 }, 27 },
28 'targets' : [ 28 'targets' : [
29 { 29 {
30 'target_name': 'prep_toolchain', 30 'target_name': 'prep_toolchain',
31 'type': 'none', 31 'type': 'none',
32 'dependencies': [ 32 'dependencies': [
33 'untar_toolchains', 33 'untar_toolchains',
34 'prep_nacl_sdk', 34 'prep_nacl_sdk',
35 ], 35 ],
36 'conditions': [ 36 'conditions': [
37 ['target_arch=="ia32" or target_arch=="x64"', { 37 ['target_arch=="ia32" or (target_arch=="x64" and OS=="win")', {
38 'dependencies': [ 38 'dependencies': [
39 'crt_init_32', 39 'crt_init_32',
40 'crt_fini_32', 40 'crt_fini_32',
41 ],
42 }],
43 ['(target_arch=="ia32" and OS=="win") or target_arch=="x64"', {
44 'dependencies': [
41 'crt_init_64', 45 'crt_init_64',
42 'crt_fini_64', 46 'crt_fini_64',
43 ], 47 ],
44 }], 48 }],
45 ['target_arch=="arm"', { 49 ['target_arch=="arm"', {
46 'dependencies': [ 50 'dependencies': [
47 'crt_init_arm', 51 'crt_init_arm',
48 'crt_fini_arm', 52 'crt_fini_arm',
49 ] 53 ]
50 }], 54 }],
(...skipping 187 matching lines...) Expand 10 before | Expand all | Expand 10 after
238 '--tool', 'pnacl', 242 '--tool', 'pnacl',
239 '--path', '<(pnacl_dir)', 243 '--path', '<(pnacl_dir)',
240 ], 244 ],
241 }, 245 },
242 ] 246 ]
243 }], 247 }],
244 ] 248 ]
245 }, 249 },
246 ], 250 ],
247 'conditions': [ 251 'conditions': [
248 ['target_arch=="ia32" or target_arch=="x64"', { 252 ['(target_arch=="ia32" and OS=="win") or target_arch=="x64"', {
249 'targets' : [ 253 'targets' : [
250 { 254 {
251 'target_name': 'crt_init_64', 255 'target_name': 'crt_init_64',
252 'type': 'none', 256 'type': 'none',
253 'dependencies': [ 257 'dependencies': [
254 'untar_toolchains', 258 'untar_toolchains',
255 'prep_nacl_sdk' 259 'prep_nacl_sdk'
256 ], 260 ],
257 'variables': { 261 'variables': {
258 'nlib_target': 'crti.o', 262 'nlib_target': 'crti.o',
(...skipping 31 matching lines...) Expand 10 before | Expand all | Expand 10 after
290 '--no-suffix', 294 '--no-suffix',
291 '--strip=_x86_64' 295 '--strip=_x86_64'
292 ], 296 ],
293 }, 297 },
294 'sources': [ 298 'sources': [
295 'src/untrusted/stubs/crtn_x86_64.S' 299 'src/untrusted/stubs/crtn_x86_64.S'
296 ], 300 ],
297 } 301 }
298 ], 302 ],
299 }], 303 }],
300 ['target_arch=="ia32" or target_arch=="x64"', { 304 ['target_arch=="ia32" or (target_arch=="x64" and OS=="win")', {
301 'targets' : [ 305 'targets' : [
302 { 306 {
303 'target_name': 'crt_init_32', 307 'target_name': 'crt_init_32',
304 'type': 'none', 308 'type': 'none',
305 'dependencies': [ 309 'dependencies': [
306 'untar_toolchains', 310 'untar_toolchains',
307 'prep_nacl_sdk' 311 'prep_nacl_sdk'
308 ], 312 ],
309 'variables': { 313 'variables': {
310 'nlib_target': 'crti.o', 314 'nlib_target': 'crti.o',
(...skipping 83 matching lines...) Expand 10 before | Expand all | Expand 10 after
394 ], 398 ],
395 }, 399 },
396 'sources': [ 400 'sources': [
397 'src/untrusted/stubs/crtn_arm.S' 401 'src/untrusted/stubs/crtn_arm.S'
398 ], 402 ],
399 } 403 }
400 ], 404 ],
401 }], 405 }],
402 ], 406 ],
403 } 407 }
OLDNEW
« 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