Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(61)

Side by Side Diff: trunk/src/build/common.gypi

Issue 26864005: Revert 215743 "Don't pass /safeseh to the linker when using clan..." (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 2 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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 4549 matching lines...) Expand 10 before | Expand all | Expand 10 after
4560 '/safeseh', 4560 '/safeseh',
4561 '/dynamicbase', 4561 '/dynamicbase',
4562 '/ignore:4199', 4562 '/ignore:4199',
4563 '/ignore:4221', 4563 '/ignore:4221',
4564 '/nxcompat', 4564 '/nxcompat',
4565 ], 4565 ],
4566 'conditions': [ 4566 'conditions': [
4567 ['asan==0', { 4567 ['asan==0', {
4568 'AdditionalOptions': ['/largeaddressaware'], 4568 'AdditionalOptions': ['/largeaddressaware'],
4569 }], 4569 }],
4570 ['clang==1', {
4571 'AdditionalOptions!': ['/safeseh'],
4572 }],
4573 ], 4570 ],
4574 }, 4571 },
4575 }, 4572 },
4576 }, 4573 },
4577 'x64_Base': { 4574 'x64_Base': {
4578 'msvs_settings': { 4575 'msvs_settings': {
4579 'VCLinkerTool': { 4576 'VCLinkerTool': {
4580 'AdditionalOptions': [ 4577 'AdditionalOptions': [
4581 # safeseh is not compatible with x64 4578 # safeseh is not compatible with x64
4582 '/dynamicbase', 4579 '/dynamicbase',
(...skipping 146 matching lines...) Expand 10 before | Expand all | Expand 10 after
4729 # settings in target dicts. SYMROOT is a special case, because many other 4726 # settings in target dicts. SYMROOT is a special case, because many other
4730 # Xcode variables depend on it, including variables such as 4727 # Xcode variables depend on it, including variables such as
4731 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4728 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4732 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4729 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4733 # files to appear (when present) in the UI as actual files and not red 4730 # files to appear (when present) in the UI as actual files and not red
4734 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4731 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4735 # and therefore SYMROOT, needs to be set at the project level. 4732 # and therefore SYMROOT, needs to be set at the project level.
4736 'SYMROOT': '<(DEPTH)/xcodebuild', 4733 'SYMROOT': '<(DEPTH)/xcodebuild',
4737 }, 4734 },
4738 } 4735 }
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698