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 521 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
532 ) | 532 ) |
533 mac_env.Append(BUILD_GROUPS = ['default']) | 533 mac_env.Append(BUILD_GROUPS = ['default']) |
534 | 534 |
535 mac_env.Replace( | 535 mac_env.Replace( |
536 # Reproduce XCode's behavior of using gcc even to link C++, | 536 # Reproduce XCode's behavior of using gcc even to link C++, |
537 # and distinguishing it the -x c++ option. | 537 # and distinguishing it the -x c++ option. |
538 CC = 'gcc-4.2', | 538 CC = 'gcc-4.2', |
539 CXX = 'g++-4.2', | 539 CXX = 'g++-4.2', |
540 LINK = '$CXX', | 540 LINK = '$CXX', |
541 ) | 541 ) |
| 542 mac_env.FilterOut(SHCCFLAGS = ['-fPIC']) |
| 543 mac_env.FilterOut(SHLINKFLAGS = ['-fPIC']) |
542 | 544 |
543 mac_env.FilterOut( | 545 mac_env.FilterOut( |
544 BUILD_SCONSCRIPTS = [ | 546 BUILD_SCONSCRIPTS = [ |
545 '$BREAKPAD_DIR/SConscript', | 547 '$BREAKPAD_DIR/SConscript', |
546 '$BSDIFF_DIR/bsdiff.scons', | 548 '$BSDIFF_DIR/bsdiff.scons', |
547 '$BSPATCH_DIR/bspatch.scons', | 549 '$BSPATCH_DIR/bspatch.scons', |
548 '$CHROME_DIR/chrome.scons', | 550 '$CHROME_DIR/chrome.scons', |
549 '$GOOGLE_UPDATE_DIR/SConscript', | 551 '$GOOGLE_UPDATE_DIR/SConscript', |
550 '$LIBJPEG_DIR/libjpeg.scons', | 552 '$LIBJPEG_DIR/libjpeg.scons', |
551 '$LIBXML_DIR/libxml.scons', | 553 '$LIBXML_DIR/libxml.scons', |
(...skipping 166 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
718 'all_libraries', | 720 'all_libraries', |
719 'all_languages', | 721 'all_languages', |
720 'all_programs', | 722 'all_programs', |
721 'all_test_programs', | 723 'all_test_programs', |
722 ], projects = [p], | 724 ], projects = [p], |
723 COMPONENT_VS_PROJECT_SCRIPT_PATH=( | 725 COMPONENT_VS_PROJECT_SCRIPT_PATH=( |
724 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), | 726 'cd $$(ProjectDir)/$VS_PROJECT_TO_MAIN_DIR && hammer.bat'), |
725 ) | 727 ) |
726 | 728 |
727 # ------------------------------------------------------------------------- | 729 # ------------------------------------------------------------------------- |
OLD | NEW |