| OLD | NEW |
| 1 # Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 # Copyright (c) 2012 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 4296 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 4307 # '-Wl,--threads', | 4307 # '-Wl,--threads', |
| 4308 # '-Wl,--thread-count=4', | 4308 # '-Wl,--thread-count=4', |
| 4309 ], | 4309 ], |
| 4310 }], | 4310 }], |
| 4311 ], | 4311 ], |
| 4312 'conditions': [ | 4312 'conditions': [ |
| 4313 ['release_valgrind_build==0', { | 4313 ['release_valgrind_build==0', { |
| 4314 'target_conditions': [ | 4314 'target_conditions': [ |
| 4315 ['_toolset=="target"', { | 4315 ['_toolset=="target"', { |
| 4316 'ldflags': [ | 4316 'ldflags': [ |
| 4317 # There seems to be a conflict of --icf and -pie | 4317 '-Wl,--icf=safe', |
| 4318 # in gold which can generate crashy binaries. As | |
| 4319 # a security measure, -pie takes precedence for | |
| 4320 # now. | |
| 4321 #'-Wl,--icf=safe', | |
| 4322 '-Wl,--icf=none', | |
| 4323 ], | 4318 ], |
| 4324 }], | 4319 }], |
| 4325 ], | 4320 ], |
| 4326 }], | 4321 }], |
| 4327 ], | 4322 ], |
| 4328 }], | 4323 }], |
| 4329 ['linux_use_bundled_binutils==1', { | 4324 ['linux_use_bundled_binutils==1', { |
| 4330 'cflags': [ | 4325 'cflags': [ |
| 4331 '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)', | 4326 '-B<!(cd <(DEPTH) && pwd -P)/<(binutils_dir)', |
| 4332 ], | 4327 ], |
| (...skipping 1445 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 5778 # settings in target dicts. SYMROOT is a special case, because many other | 5773 # settings in target dicts. SYMROOT is a special case, because many other |
| 5779 # Xcode variables depend on it, including variables such as | 5774 # Xcode variables depend on it, including variables such as |
| 5780 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 5775 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 5781 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 5776 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 5782 # files to appear (when present) in the UI as actual files and not red | 5777 # files to appear (when present) in the UI as actual files and not red |
| 5783 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 5778 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 5784 # and therefore SYMROOT, needs to be set at the project level. | 5779 # and therefore SYMROOT, needs to be set at the project level. |
| 5785 'SYMROOT': '<(DEPTH)/xcodebuild', | 5780 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 5786 }, | 5781 }, |
| 5787 } | 5782 } |
| OLD | NEW |