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

Side by Side Diff: build/common.gypi

Issue 1229653005: roll clang 239765:241602 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: gnbleh 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
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('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 3068 matching lines...) Expand 10 before | Expand all | Expand 10 after
3079 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { 3079 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
3080 'defines': ['USE_NSS_CERTS=1'], 3080 'defines': ['USE_NSS_CERTS=1'],
3081 }], 3081 }],
3082 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { 3082 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
3083 'defines': ['OS_CHROMEOS=1'], 3083 'defines': ['OS_CHROMEOS=1'],
3084 }], 3084 }],
3085 ['enable_wexit_time_destructors==1 and OS!="win"', { 3085 ['enable_wexit_time_destructors==1 and OS!="win"', {
3086 # TODO: Enable on Windows too, http://crbug.com/404525 3086 # TODO: Enable on Windows too, http://crbug.com/404525
3087 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, 3087 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
3088 }], 3088 }],
3089 ['"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2 39674-1" and ' 3089 ['"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2 39674-1"', {
3090 '"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2 39765-1"', {
3091 # TODO(thakis): Move this to the global clang_warning_flags block once 3090 # TODO(thakis): Move this to the global clang_warning_flags block once
3092 # clang is rolled far enough that the pinned clang understands this flag 3091 # clang is rolled far enough that the pinned clang understands this flag
3093 # TODO(thakis): Enable this, crbug.com/507717 3092 # TODO(thakis): Enable this, crbug.com/507717
3094 'variables': { 'clang_warning_flags': ['-Wno-shift-negative-value']}, 3093 'variables': { 'clang_warning_flags': ['-Wno-shift-negative-value']},
3095 }], 3094 }],
3096 ['chromium_code==0', { 3095 ['chromium_code==0', {
3097 'conditions': [ 3096 'conditions': [
3098 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { 3097 [ 'os_posix==1 and OS!="mac" and OS!="ios"', {
3099 # We don't want to get warnings from third-party code, 3098 # We don't want to get warnings from third-party code,
3100 # so remove any existing warning-enabling flags like -Wall. 3099 # so remove any existing warning-enabling flags like -Wall.
(...skipping 3092 matching lines...) Expand 10 before | Expand all | Expand 10 after
6193 # settings in target dicts. SYMROOT is a special case, because many other 6192 # settings in target dicts. SYMROOT is a special case, because many other
6194 # Xcode variables depend on it, including variables such as 6193 # Xcode variables depend on it, including variables such as
6195 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6194 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6196 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6195 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6197 # files to appear (when present) in the UI as actual files and not red 6196 # files to appear (when present) in the UI as actual files and not red
6198 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6197 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6199 # and therefore SYMROOT, needs to be set at the project level. 6198 # and therefore SYMROOT, needs to be set at the project level.
6200 'SYMROOT': '<(DEPTH)/xcodebuild', 6199 'SYMROOT': '<(DEPTH)/xcodebuild',
6201 }, 6200 },
6202 } 6201 }
OLDNEW
« no previous file with comments | « no previous file | build/config/compiler/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698