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

Side by Side Diff: chrome/nacl.gypi

Issue 7828095: Fix NaCl build error with ninja. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 9 years, 3 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 | « no previous file | 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 'target_defaults': { 6 'target_defaults': {
7 'variables': { 7 'variables': {
8 'nacl_target': 0, 8 'nacl_target': 0,
9 }, 9 },
10 'target_conditions': [ 10 'target_conditions': [
(...skipping 250 matching lines...) Expand 10 before | Expand all | Expand 10 after
261 # to remove -f* flags, just in case some system's compiler 261 # to remove -f* flags, just in case some system's compiler
262 # defaults to using PIC for everything. 262 # defaults to using PIC for everything.
263 '-fno-pic', '-fno-PIC', 263 '-fno-pic', '-fno-PIC',
264 '-fno-pie', '-fno-PIE', 264 '-fno-pie', '-fno-PIE',
265 ], 265 ],
266 'link_settings': { 266 'link_settings': {
267 'ldflags': [ 267 'ldflags': [
268 # TODO(bradchen): Delete the -B argument when Gold is verified 268 # TODO(bradchen): Delete the -B argument when Gold is verified
269 # to produce good results with our custom linker script. 269 # to produce good results with our custom linker script.
270 # Until then use ld.bfd. 270 # Until then use ld.bfd.
271 '-B', 'tools/ld_bfd', 271 '-B', '<(PRODUCT_DIR)/../../tools/ld_bfd',
272 # This programs is (almost) entirely standalone. It has 272 # This programs is (almost) entirely standalone. It has
273 # its own startup code, so no crt1.o for it. It is 273 # its own startup code, so no crt1.o for it. It is
274 # statically linked, and on x86 it actually does not use 274 # statically linked, and on x86 it actually does not use
275 # libc at all. However, on ARM it needs a few (safe) 275 # libc at all. However, on ARM it needs a few (safe)
276 # things from libc, so we don't use '-nostdlib' here. 276 # things from libc, so we don't use '-nostdlib' here.
277 '-static', '-nostartfiles', 277 '-static', '-nostartfiles',
278 # Link with our custom linker script to get out special layout. 278 # Link with our custom linker script to get out special layout.
279 # TODO(bradnelson): Use some <(foo) instead of chrome/ here. 279 '-Wl,--script=<(PRODUCT_DIR)/../../chrome/nacl/nacl_helper_bootstr ap_linux.x',
280 '-Wl,--script=chrome/nacl/nacl_helper_bootstrap_linux.x',
281 # On x86-64, the default page size with some 280 # On x86-64, the default page size with some
282 # linkers is 2M rather than the real Linux page 281 # linkers is 2M rather than the real Linux page
283 # size of 4K. A larger page size is incompatible 282 # size of 4K. A larger page size is incompatible
284 # with our custom linker script's special layout. 283 # with our custom linker script's special layout.
285 '-Wl,-z,max-page-size=0x1000', 284 '-Wl,-z,max-page-size=0x1000',
286 ], 285 ],
287 }, 286 },
288 }, 287 },
289 { 288 {
290 'target_name': 'nacl_helper_bootstrap', 289 'target_name': 'nacl_helper_bootstrap',
291 'dependencies': [ 290 'dependencies': [
292 'nacl_helper_bootstrap_raw', 291 'nacl_helper_bootstrap_raw',
293 'nacl_helper_bootstrap_munge_phdr#host', 292 'nacl_helper_bootstrap_munge_phdr#host',
294 ], 293 ],
295 'type': 'none', 294 'type': 'none',
296 'actions': [{ 295 'actions': [{
297 'action_name': 'munge_phdr', 296 'action_name': 'munge_phdr',
298 'inputs': ['nacl/nacl_helper_bootstrap_munge_phdr.py', 297 'inputs': ['nacl/nacl_helper_bootstrap_munge_phdr.py',
299 '<(PRODUCT_DIR)/nacl_helper_bootstrap_munge_phdr', 298 '<(PRODUCT_DIR)/nacl_helper_bootstrap_munge_phdr',
300 '<(PRODUCT_DIR)/nacl_helper_bootstrap_raw'], 299 '<(PRODUCT_DIR)/nacl_helper_bootstrap_raw'],
301 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'], 300 'outputs': ['<(PRODUCT_DIR)/nacl_helper_bootstrap'],
302 'message': 'Munging ELF program header', 301 'message': 'Munging ELF program header',
303 'action': ['python', '<@(_inputs)', '<@(_outputs)'] 302 'action': ['python', '<@(_inputs)', '<@(_outputs)']
304 }], 303 }],
305 } 304 }
306 ], 305 ],
307 }], 306 }],
308 ], 307 ],
309 } 308 }
OLDNEW
« 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