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

Side by Side Diff: build/common.gypi

Issue 1239653004: Update Clang build script and gyp file for 3.8.0 version bump (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: grab the full lib dir in the .isolates file Created 5 years, 5 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
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 5809 matching lines...) Expand 10 before | Expand all | Expand 10 after
5820 'VCCLCompilerTool': { 5820 'VCCLCompilerTool': {
5821 'AdditionalOptions': [ 5821 'AdditionalOptions': [
5822 '-fsanitize=address', 5822 '-fsanitize=address',
5823 '-fsanitize-blacklist=<(PRODUCT_DIR)/../../tools/memory/as an/blacklist_win.txt', 5823 '-fsanitize-blacklist=<(PRODUCT_DIR)/../../tools/memory/as an/blacklist_win.txt',
5824 ], 5824 ],
5825 'AdditionalIncludeDirectories': [ 5825 'AdditionalIncludeDirectories': [
5826 # MSVC needs to be able to find the sanitizer headers when 5826 # MSVC needs to be able to find the sanitizer headers when
5827 # invoked via /fallback. This is critical for using macros 5827 # invoked via /fallback. This is critical for using macros
5828 # like ASAN_UNPOISON_MEMORY_REGION in files where we fall 5828 # like ASAN_UNPOISON_MEMORY_REGION in files where we fall
5829 # back. 5829 # back.
5830 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.7.0/include_saniti zer', 5830 '<(DEPTH)/<(make_clang_dir)/lib/clang/<!(python <(DEPTH)/t ools/clang/scripts/update.py --print-clang-version)/include_sanitizer',
5831 ], 5831 ],
5832 }, 5832 },
5833 'VCLinkerTool': { 5833 'VCLinkerTool': {
5834 'AdditionalLibraryDirectories': [ 5834 'AdditionalLibraryDirectories': [
5835 # TODO(hans): If make_clang_dir is absolute, this breaks. 5835 # TODO(hans): If make_clang_dir is absolute, this breaks.
5836 '<(DEPTH)/<(make_clang_dir)/lib/clang/3.7.0/lib/windows', 5836 '<(DEPTH)/<(make_clang_dir)/lib/clang/<!(python <(DEPTH)/t ools/clang/scripts/update.py --print-clang-version)/lib/windows',
5837 ], 5837 ],
5838 }, 5838 },
5839 'target_conditions': [ 5839 'target_conditions': [
5840 ['component=="shared_library"', { 5840 ['component=="shared_library"', {
5841 'VCLinkerTool': { 5841 'VCLinkerTool': {
5842 'AdditionalDependencies': [ 5842 'AdditionalDependencies': [
5843 'clang_rt.asan_dynamic-i386.lib', 5843 'clang_rt.asan_dynamic-i386.lib',
5844 'clang_rt.asan_dynamic_runtime_thunk-i386.lib', 5844 'clang_rt.asan_dynamic_runtime_thunk-i386.lib',
5845 ], 5845 ],
5846 }, 5846 },
(...skipping 347 matching lines...) Expand 10 before | Expand all | Expand 10 after
6194 # settings in target dicts. SYMROOT is a special case, because many other 6194 # settings in target dicts. SYMROOT is a special case, because many other
6195 # Xcode variables depend on it, including variables such as 6195 # Xcode variables depend on it, including variables such as
6196 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6196 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6197 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6197 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6198 # files to appear (when present) in the UI as actual files and not red 6198 # files to appear (when present) in the UI as actual files and not red
6199 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6199 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6200 # and therefore SYMROOT, needs to be set at the project level. 6200 # and therefore SYMROOT, needs to be set at the project level.
6201 'SYMROOT': '<(DEPTH)/xcodebuild', 6201 'SYMROOT': '<(DEPTH)/xcodebuild',
6202 }, 6202 },
6203 } 6203 }
OLDNEW
« no previous file with comments | « base/base.isolate ('k') | build/win/asan.gyp » ('j') | tools/clang/scripts/update.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698