| OLD | NEW |
| 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 # IMPORTANT: | 5 # IMPORTANT: |
| 6 # Please don't directly include this file if you are building via gyp_chromium, | 6 # Please don't directly include this file if you are building via gyp_chromium, |
| 7 # since gyp_chromium is automatically forcing its inclusion. | 7 # since gyp_chromium is automatically forcing its inclusion. |
| 8 { | 8 { |
| 9 # Variables expected to be overriden on the GYP command line (-D) or by | 9 # Variables expected to be overriden on the GYP command line (-D) or by |
| 10 # ~/.gyp/include.gypi. | 10 # ~/.gyp/include.gypi. |
| (...skipping 1493 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1504 }], | 1504 }], |
| 1505 ], | 1505 ], |
| 1506 }, | 1506 }, |
| 1507 'target_conditions': [ | 1507 'target_conditions': [ |
| 1508 ['_type!="static_library"', { | 1508 ['_type!="static_library"', { |
| 1509 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, | 1509 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-search_paths_first']}, |
| 1510 }], | 1510 }], |
| 1511 ['_mac_bundle', { | 1511 ['_mac_bundle', { |
| 1512 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, | 1512 'xcode_settings': {'OTHER_LDFLAGS': ['-Wl,-ObjC']}, |
| 1513 }], | 1513 }], |
| 1514 ['_type=="executable" and release_valgrind_build==0', { |
| 1515 # Turn on position-independence (ASLR) for executables. When PIE |
| 1516 # is on for the Chrome executables, the framework will also be |
| 1517 # subject to ASLR. |
| 1518 # Don't do this when building for Valgrind because Valgrind |
| 1519 # doesn't understand slide. TODO: Make Valgrind on Mac OS X |
| 1520 # understand slide, and get rid of the Valgrind check. |
| 1521 'xcode_settings': { |
| 1522 'OTHER_LDFLAGS': [ |
| 1523 '-Wl,-pie', # Position-independent executable (MH_PIE) |
| 1524 ], |
| 1525 }, |
| 1526 }], |
| 1514 ['(_type=="executable" or _type=="shared_library" or \ | 1527 ['(_type=="executable" or _type=="shared_library" or \ |
| 1515 _type=="loadable_module") and mac_strip!=0', { | 1528 _type=="loadable_module") and mac_strip!=0', { |
| 1516 'target_conditions': [ | 1529 'target_conditions': [ |
| 1517 ['mac_real_dsym == 1', { | 1530 ['mac_real_dsym == 1', { |
| 1518 # To get a real .dSYM bundle produced by dsymutil, set the | 1531 # To get a real .dSYM bundle produced by dsymutil, set the |
| 1519 # debug information format to dwarf-with-dsym. Since | 1532 # debug information format to dwarf-with-dsym. Since |
| 1520 # strip_from_xcode will not be used, set Xcode to do the | 1533 # strip_from_xcode will not be used, set Xcode to do the |
| 1521 # stripping as well. | 1534 # stripping as well. |
| 1522 'configurations': { | 1535 'configurations': { |
| 1523 'Release_Base': { | 1536 'Release_Base': { |
| (...skipping 254 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1778 # and therefore SYMROOT, needs to be set at the project level. | 1791 # and therefore SYMROOT, needs to be set at the project level. |
| 1779 'SYMROOT': '<(DEPTH)/xcodebuild', | 1792 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 1780 }, | 1793 }, |
| 1781 } | 1794 } |
| 1782 | 1795 |
| 1783 # Local Variables: | 1796 # Local Variables: |
| 1784 # tab-width:2 | 1797 # tab-width:2 |
| 1785 # indent-tabs-mode:nil | 1798 # indent-tabs-mode:nil |
| 1786 # End: | 1799 # End: |
| 1787 # vim: set expandtab tabstop=2 shiftwidth=2: | 1800 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |