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

Side by Side Diff: build/common.gypi

Issue 281413006: Win-clang update script: make an auxiliary copy of the sanitizer headers (Closed) Base URL: https://chromium.googlesource.com/chromium/src
Patch Set: Revert accidental #define changes Created 6 years, 7 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
« no previous file with comments | « no previous file | tools/clang/scripts/update.py » ('j') | 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 5042 matching lines...) Expand 10 before | Expand all | Expand 10 after
5053 ], 5053 ],
5054 }, 5054 },
5055 }], 5055 }],
5056 ['asan==1', { 5056 ['asan==1', {
5057 # ASan on Windows is a work in progress and very experimental. 5057 # ASan on Windows is a work in progress and very experimental.
5058 # See crbug.com/345874. 5058 # See crbug.com/345874.
5059 'VCCLCompilerTool': { 5059 'VCCLCompilerTool': {
5060 'AdditionalOptions': [ 5060 'AdditionalOptions': [
5061 '-fsanitize=address', 5061 '-fsanitize=address',
5062 ], 5062 ],
5063 'AdditionalIncludeDirectories': [
Reid Kleckner 2014/05/15 23:58:52 Can you comment that MSVC needs to be able to incl
hans 2014/05/16 00:20:57 Done.
5064 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.5.0/include_sanitizer' ,
Reid Kleckner 2014/05/15 23:58:52 80cols
hans 2014/05/16 00:20:57 We don't seem to use the 80-cols limit for lines l
5065 ],
5063 }, 5066 },
5064 'VCLinkerTool': { 5067 'VCLinkerTool': {
5065 'AdditionalLibraryDirectories': [ 5068 'AdditionalLibraryDirectories': [
5066 # TODO(hans): If make_clang_dir is absolute, this breaks. 5069 # TODO(hans): If make_clang_dir is absolute, this breaks.
5067 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.5.0/lib/windows', 5070 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.5.0/lib/windows',
5068 ], 5071 ],
5069 }, 5072 },
5070 'target_conditions': [ 5073 'target_conditions': [
5071 ['_type=="executable"', { 5074 ['_type=="executable"', {
5072 'VCLinkerTool': { 5075 'VCLinkerTool': {
(...skipping 208 matching lines...) Expand 10 before | Expand all | Expand 10 after
5281 # settings in target dicts. SYMROOT is a special case, because many other 5284 # settings in target dicts. SYMROOT is a special case, because many other
5282 # Xcode variables depend on it, including variables such as 5285 # Xcode variables depend on it, including variables such as
5283 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5286 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5284 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5287 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5285 # files to appear (when present) in the UI as actual files and not red 5288 # files to appear (when present) in the UI as actual files and not red
5286 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5289 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5287 # and therefore SYMROOT, needs to be set at the project level. 5290 # and therefore SYMROOT, needs to be set at the project level.
5288 'SYMROOT': '<(DEPTH)/xcodebuild', 5291 'SYMROOT': '<(DEPTH)/xcodebuild',
5289 }, 5292 },
5290 } 5293 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698