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

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

Issue 13871019: Revert 195379 "roll clang 176256:179138" (Closed) Base URL: svn://svn.chromium.org/chrome/
Patch Set: Created 7 years, 8 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 | trunk/src/tools/clang/scripts/update.sh » ('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 2951 matching lines...) Expand 10 before | Expand all | Expand 10 after
2962 ['clang==1 and clang_load!=""', { 2962 ['clang==1 and clang_load!=""', {
2963 'cflags': [ 2963 'cflags': [
2964 '-Xclang', '-load', '-Xclang', '<(clang_load)', 2964 '-Xclang', '-load', '-Xclang', '<(clang_load)',
2965 ], 2965 ],
2966 }], 2966 }],
2967 ['clang==1 and clang_add_plugin!=""', { 2967 ['clang==1 and clang_add_plugin!=""', {
2968 'cflags': [ 2968 'cflags': [
2969 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)', 2969 '-Xclang', '-add-plugin', '-Xclang', '<(clang_add_plugin)',
2970 ], 2970 ],
2971 }], 2971 }],
2972 ['clang==1 and target_arch=="ia32"', {
2973 'cflags': [
2974 # Else building libyuv gives clang's register allocator issues,
2975 # see llvm.org/PR15798 / crbug.com/233709
2976 '-momit-leaf-frame-pointer',
2977 ],
2978 }],
2979 ['clang==1 and "<(GENERATOR)"=="ninja"', { 2972 ['clang==1 and "<(GENERATOR)"=="ninja"', {
2980 'cflags': [ 2973 'cflags': [
2981 # See http://crbug.com/110262 2974 # See http://crbug.com/110262
2982 '-fcolor-diagnostics', 2975 '-fcolor-diagnostics',
2983 ], 2976 ],
2984 }], 2977 }],
2985 # Common options for AddressSanitizer, ThreadSanitizer and 2978 # Common options for AddressSanitizer, ThreadSanitizer and
2986 # MemorySanitizer. 2979 # MemorySanitizer.
2987 ['asan==1 or tsan==1 or msan==1', { 2980 ['asan==1 or tsan==1 or msan==1', {
2988 'target_conditions': [ 2981 'target_conditions': [
(...skipping 1280 matching lines...) Expand 10 before | Expand all | Expand 10 after
4269 # settings in target dicts. SYMROOT is a special case, because many other 4262 # settings in target dicts. SYMROOT is a special case, because many other
4270 # Xcode variables depend on it, including variables such as 4263 # Xcode variables depend on it, including variables such as
4271 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4264 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4272 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4265 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4273 # files to appear (when present) in the UI as actual files and not red 4266 # files to appear (when present) in the UI as actual files and not red
4274 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4267 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4275 # and therefore SYMROOT, needs to be set at the project level. 4268 # and therefore SYMROOT, needs to be set at the project level.
4276 'SYMROOT': '<(DEPTH)/xcodebuild', 4269 'SYMROOT': '<(DEPTH)/xcodebuild',
4277 }, 4270 },
4278 } 4271 }
OLDNEW
« no previous file with comments | « no previous file | trunk/src/tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698