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 4524 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4535 '/safeseh', | 4535 '/safeseh', |
4536 '/dynamicbase', | 4536 '/dynamicbase', |
4537 '/ignore:4199', | 4537 '/ignore:4199', |
4538 '/ignore:4221', | 4538 '/ignore:4221', |
4539 '/nxcompat', | 4539 '/nxcompat', |
4540 ], | 4540 ], |
4541 'conditions': [ | 4541 'conditions': [ |
4542 ['asan==0', { | 4542 ['asan==0', { |
4543 'AdditionalOptions': ['/largeaddressaware'], | 4543 'AdditionalOptions': ['/largeaddressaware'], |
4544 }], | 4544 }], |
| 4545 ['clang==1', { |
| 4546 'AdditionalOptions!': ['/safeseh'], |
| 4547 }], |
4545 ], | 4548 ], |
4546 }, | 4549 }, |
4547 }, | 4550 }, |
4548 }, | 4551 }, |
4549 'x64_Base': { | 4552 'x64_Base': { |
4550 'msvs_settings': { | 4553 'msvs_settings': { |
4551 'VCLinkerTool': { | 4554 'VCLinkerTool': { |
4552 'AdditionalOptions': [ | 4555 'AdditionalOptions': [ |
4553 # safeseh is not compatible with x64 | 4556 # safeseh is not compatible with x64 |
4554 '/dynamicbase', | 4557 '/dynamicbase', |
(...skipping 127 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
4682 # settings in target dicts. SYMROOT is a special case, because many other | 4685 # settings in target dicts. SYMROOT is a special case, because many other |
4683 # Xcode variables depend on it, including variables such as | 4686 # Xcode variables depend on it, including variables such as |
4684 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 4687 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
4685 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 4688 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
4686 # files to appear (when present) in the UI as actual files and not red | 4689 # files to appear (when present) in the UI as actual files and not red |
4687 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 4690 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
4688 # and therefore SYMROOT, needs to be set at the project level. | 4691 # and therefore SYMROOT, needs to be set at the project level. |
4689 'SYMROOT': '<(DEPTH)/xcodebuild', | 4692 'SYMROOT': '<(DEPTH)/xcodebuild', |
4690 }, | 4693 }, |
4691 } | 4694 } |
OLD | NEW |