| OLD | NEW |
| 1 # Copyright (c) 2006-2008 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2006-2008 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 import os | 5 import os |
| 6 import shutil | 6 import shutil |
| 7 import sys | 7 import sys |
| 8 | 8 |
| 9 | 9 |
| 10 if sys.platform == 'win32': | 10 if sys.platform == 'win32': |
| (...skipping 293 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 304 ], | 304 ], |
| 305 | 305 |
| 306 CCFLAGS = [ | 306 CCFLAGS = [ |
| 307 '/nologo', | 307 '/nologo', |
| 308 '/errorReport:prompt', | 308 '/errorReport:prompt', |
| 309 ], | 309 ], |
| 310 | 310 |
| 311 CPPDEFINES = [ | 311 CPPDEFINES = [ |
| 312 '_UNICODE', | 312 '_UNICODE', |
| 313 'UNICODE', | 313 'UNICODE', |
| 314 'OS_WIN', |
| 314 ], | 315 ], |
| 315 | 316 |
| 316 | 317 |
| 317 LIBS = [ | 318 LIBS = [ |
| 318 'advapi32.lib', | 319 'advapi32.lib', |
| 319 'comdlg32.lib', | 320 'comdlg32.lib', |
| 320 'gdi32.lib', | 321 'gdi32.lib', |
| 321 'kernel32.lib', | 322 'kernel32.lib', |
| 322 'odbc32.lib', | 323 'odbc32.lib', |
| 323 'odbccp32.lib', | 324 'odbccp32.lib', |
| (...skipping 133 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 457 ], | 458 ], |
| 458 CCFLAGS = ['-m32', '-pthread', '-march=i686', '-fno-exceptions'], | 459 CCFLAGS = ['-m32', '-pthread', '-march=i686', '-fno-exceptions'], |
| 459 # GCC will generate ident directives with the GCC version. Accumulate | 460 # GCC will generate ident directives with the GCC version. Accumulate |
| 460 # these all up and you end up with ~80K repeated in a .comment section. | 461 # these all up and you end up with ~80K repeated in a .comment section. |
| 461 CCFLAGS_OPTIMIZED = ['-fno-ident'], | 462 CCFLAGS_OPTIMIZED = ['-fno-ident'], |
| 462 CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings, | 463 CXXFLAGS = ['-Wall', '-Werror', '-march=i686'] + excluded_warnings, |
| 463 LINKFLAGS = ['-m32', '-pthread'], | 464 LINKFLAGS = ['-m32', '-pthread'], |
| 464 ) | 465 ) |
| 465 | 466 |
| 466 linux_env.Replace( | 467 linux_env.Replace( |
| 468 CPPDEFINES = [ |
| 469 'OS_LINUX', |
| 470 'OS_POSIX', |
| 471 ], |
| 472 |
| 467 # Linking of large files uses lots of RAM, so serialize links | 473 # Linking of large files uses lots of RAM, so serialize links |
| 468 # using the handy flock command from util-linux. | 474 # using the handy flock command from util-linux. |
| 469 LINK = 'flock $TARGET_ROOT/linker.lock ' + linux_env['LINK'], | 475 LINK = 'flock $TARGET_ROOT/linker.lock ' + linux_env['LINK'], |
| 470 | 476 |
| 471 # We have several cases where archives depend on each other in a cyclic | 477 # We have several cases where archives depend on each other in a cyclic |
| 472 # fashion. (V8Bindings, libport and WebCore being the most significant | 478 # fashion. (V8Bindings, libport and WebCore being the most significant |
| 473 # example.) Since the GNU linker does only a single pass over the archives | 479 # example.) Since the GNU linker does only a single pass over the archives |
| 474 # we need some extra trickery to deal with these unavoidable cycles. That | 480 # we need some extra trickery to deal with these unavoidable cycles. That |
| 475 # trickery is --start-group and --end-group (aka -( and -) ). That causes ld | 481 # trickery is --start-group and --end-group (aka -( and -) ). That causes ld |
| 476 # to loop over the group until no more undefined symbols are found. In an | 482 # to loop over the group until no more undefined symbols are found. In an |
| (...skipping 188 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 665 '-Wnewline-eof', | 671 '-Wnewline-eof', |
| 666 '-fvisibility=hidden', | 672 '-fvisibility=hidden', |
| 667 '-gdwarf-2', | 673 '-gdwarf-2', |
| 668 '-Wall', | 674 '-Wall', |
| 669 '-Wendif-labels', | 675 '-Wendif-labels', |
| 670 '-fstack-protector', | 676 '-fstack-protector', |
| 671 '-fstack-protector-all', | 677 '-fstack-protector-all', |
| 672 ], | 678 ], |
| 673 CPPDEFINES = [ | 679 CPPDEFINES = [ |
| 674 'DEBUG', | 680 'DEBUG', |
| 681 'OS_MACOSX', |
| 682 'OS_POSIX', |
| 675 ], | 683 ], |
| 676 | 684 |
| 677 FRAMEWORKPATH = [ | 685 FRAMEWORKPATH = [ |
| 678 mac_env.Dir('${TARGET_ROOT}'), | 686 mac_env.Dir('${TARGET_ROOT}'), |
| 679 '/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Fra
meworks', | 687 '/System/Library/Frameworks/ApplicationServices.framework/Versions/A/Fra
meworks', |
| 680 ], | 688 ], |
| 681 FRAMEWORKS = [ | 689 FRAMEWORKS = [ |
| 682 'AppKit', | 690 'AppKit', |
| 683 'ApplicationServices', | 691 'ApplicationServices', |
| 684 'Foundation', | 692 'Foundation', |
| (...skipping 152 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 837 'all_libraries', | 845 'all_libraries', |
| 838 'all_languages', | 846 'all_languages', |
| 839 'all_programs', | 847 'all_programs', |
| 840 'all_test_programs', | 848 'all_test_programs', |
| 841 ], projects = [p], | 849 ], projects = [p], |
| 842 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 850 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
| 843 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 851 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
| 844 ) | 852 ) |
| 845 | 853 |
| 846 # ------------------------------------------------------------------------- | 854 # ------------------------------------------------------------------------- |
| OLD | NEW |