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

Side by Side Diff: build/common.gypi

Issue 417173003: Win-Clang update script: update paths for 3.6 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 4 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 | tools/clang/scripts/update.py » ('j') | tools/clang/scripts/update.py » ('J')
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 5399 matching lines...) Expand 10 before | Expand all | Expand 10 after
5410 # See crbug.com/345874. 5410 # See crbug.com/345874.
5411 'VCCLCompilerTool': { 5411 'VCCLCompilerTool': {
5412 'AdditionalOptions': [ 5412 'AdditionalOptions': [
5413 '-fsanitize=address', 5413 '-fsanitize=address',
5414 ], 5414 ],
5415 'AdditionalIncludeDirectories': [ 5415 'AdditionalIncludeDirectories': [
5416 # MSVC needs to be able to find the sanitizer headers when 5416 # MSVC needs to be able to find the sanitizer headers when
5417 # invoked via /fallback. This is critical for using macros 5417 # invoked via /fallback. This is critical for using macros
5418 # like ASAN_UNPOISON_MEMORY_REGION in files where we fall 5418 # like ASAN_UNPOISON_MEMORY_REGION in files where we fall
5419 # back. 5419 # back.
5420 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.5.0/include_sanitizer' , 5420 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/include_sanitizer' ,
5421 ], 5421 ],
5422 }, 5422 },
5423 'VCLinkerTool': { 5423 'VCLinkerTool': {
5424 'AdditionalLibraryDirectories': [ 5424 'AdditionalLibraryDirectories': [
5425 # TODO(hans): If make_clang_dir is absolute, this breaks. 5425 # TODO(hans): If make_clang_dir is absolute, this breaks.
5426 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.5.0/lib/windows', 5426 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.6.0/lib/windows',
5427 ], 5427 ],
5428 }, 5428 },
5429 'target_conditions': [ 5429 'target_conditions': [
5430 ['_type=="executable"', { 5430 ['_type=="executable"', {
5431 'VCLinkerTool': { 5431 'VCLinkerTool': {
5432 'AdditionalDependencies': [ 5432 'AdditionalDependencies': [
5433 'clang_rt.asan-i386.lib', 5433 'clang_rt.asan-i386.lib',
5434 ], 5434 ],
5435 }, 5435 },
5436 }], 5436 }],
(...skipping 213 matching lines...) Expand 10 before | Expand all | Expand 10 after
5650 # settings in target dicts. SYMROOT is a special case, because many other 5650 # settings in target dicts. SYMROOT is a special case, because many other
5651 # Xcode variables depend on it, including variables such as 5651 # Xcode variables depend on it, including variables such as
5652 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 5652 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
5653 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 5653 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
5654 # files to appear (when present) in the UI as actual files and not red 5654 # files to appear (when present) in the UI as actual files and not red
5655 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 5655 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
5656 # and therefore SYMROOT, needs to be set at the project level. 5656 # and therefore SYMROOT, needs to be set at the project level.
5657 'SYMROOT': '<(DEPTH)/xcodebuild', 5657 'SYMROOT': '<(DEPTH)/xcodebuild',
5658 }, 5658 },
5659 } 5659 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.py » ('j') | tools/clang/scripts/update.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698