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

Side by Side Diff: src/native_client/site_scons/site_tools/target_platform_windows.py

Issue 6031015: Fix the "opt-win" build on Visual Studio 10.0 (Closed)
Patch Set: Created 9 years, 11 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
« 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 #!/usr/bin/python2.4 1 #!/usr/bin/python2.4
2 # Copyright 2009, Google Inc. 2 # Copyright 2009, Google Inc.
3 # All rights reserved. 3 # All rights reserved.
4 # 4 #
5 # Redistribution and use in source and binary forms, with or without 5 # Redistribution and use in source and binary forms, with or without
6 # modification, are permitted provided that the following conditions are 6 # modification, are permitted provided that the following conditions are
7 # met: 7 # met:
8 # 8 #
9 # * Redistributions of source code must retain the above copyright 9 # * Redistributions of source code must retain the above copyright
10 # notice, this list of conditions and the following disclaimer. 10 # notice, this list of conditions and the following disclaimer.
(...skipping 386 matching lines...) Expand 10 before | Expand all | Expand 10 after
397 '/MTd', # link with LIBCMTD.LIB debug lib 397 '/MTd', # link with LIBCMTD.LIB debug lib
398 ], 398 ],
399 LINKFLAGS_DEBUG=['/DEBUG'], 399 LINKFLAGS_DEBUG=['/DEBUG'],
400 400
401 # Settings for optimized 401 # Settings for optimized
402 CCFLAGS_OPTIMIZED=[ 402 CCFLAGS_OPTIMIZED=[
403 '/O1', # optimize for size 403 '/O1', # optimize for size
404 '/MT', # link with LIBCMT.LIB (multi-threaded, static linked crt) 404 '/MT', # link with LIBCMT.LIB (multi-threaded, static linked crt)
405 '/GS', # enable security checks 405 '/GS', # enable security checks
406 ], 406 ],
407 LINKFLAGS_OPTIMIZED=['/PDBPATH:none'], 407 # Omit the absolute pathname of the .pdb debugging info file
408 # from the executable, and just use a relative pathname.
409 LINKFLAGS_OPTIMIZED=['/PDBALTPATH:%_PDB%'],
408 410
409 # Settings for component_builders 411 # Settings for component_builders
410 COMPONENT_LIBRARY_LINK_SUFFIXES=['.lib'], 412 COMPONENT_LIBRARY_LINK_SUFFIXES=['.lib'],
411 COMPONENT_LIBRARY_DEBUG_SUFFIXES=['.pdb'], 413 COMPONENT_LIBRARY_DEBUG_SUFFIXES=['.pdb'],
412 ) 414 )
413 415
414 # TODO: mslink.py creates a shlibLinkAction which doesn't specify 416 # TODO: mslink.py creates a shlibLinkAction which doesn't specify
415 # '$SHLINKCOMSTR' as its command string. This breaks --brief. For now, 417 # '$SHLINKCOMSTR' as its command string. This breaks --brief. For now,
416 # hack into the existing action and override its command string. 418 # hack into the existing action and override its command string.
417 if env['PLATFORM'] != 'darwin': 419 if env['PLATFORM'] != 'darwin':
418 env['SHLINKCOM'].list[0].cmdstr = '$SHLINKCOMSTR' 420 env['SHLINKCOM'].list[0].cmdstr = '$SHLINKCOMSTR'
419 421
420 # Restore saved flags. 422 # Restore saved flags.
421 env.Append(**saved) 423 env.Append(**saved)
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