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

Side by Side Diff: build/common.gypi

Issue 1240813002: Revert of win/clang: Roll clang 239674:242130 (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: 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 2586 matching lines...) Expand 10 before | Expand all | Expand 10 after
2597 # this is worth fixing. 2597 # this is worth fixing.
2598 '-Wno-c++11-narrowing', 2598 '-Wno-c++11-narrowing',
2599 2599
2600 # Clang considers the `register` keyword as deprecated, but e.g. 2600 # Clang considers the `register` keyword as deprecated, but e.g.
2601 # code generated by flex (used in angle) contains that keyword. 2601 # code generated by flex (used in angle) contains that keyword.
2602 # http://crbug.com/255186 2602 # http://crbug.com/255186
2603 '-Wno-deprecated-register', 2603 '-Wno-deprecated-register',
2604 2604
2605 # TODO(hans): Get this cleaned up, http://crbug.com/428099 2605 # TODO(hans): Get this cleaned up, http://crbug.com/428099
2606 '-Wno-inconsistent-missing-override', 2606 '-Wno-inconsistent-missing-override',
2607
2608 # TODO(thakis): Enable this, crbug.com/507717
2609 '-Wno-shift-negative-value',
2610 ], 2607 ],
2611 }, 2608 },
2612 'includes': [ 'set_clang_warning_flags.gypi', ], 2609 'includes': [ 'set_clang_warning_flags.gypi', ],
2613 'defines': [ 2610 'defines': [
2614 # Don't use deprecated V8 APIs anywhere. 2611 # Don't use deprecated V8 APIs anywhere.
2615 'V8_DEPRECATION_WARNINGS', 2612 'V8_DEPRECATION_WARNINGS',
2616 ], 2613 ],
2617 'include_dirs': [ 2614 'include_dirs': [
2618 '<(SHARED_INTERMEDIATE_DIR)', 2615 '<(SHARED_INTERMEDIATE_DIR)',
2619 ], 2616 ],
(...skipping 475 matching lines...) Expand 10 before | Expand all | Expand 10 after
3095 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', { 3092 ['<(use_nss_certs)==1 and >(nacl_untrusted_build)==0', {
3096 'defines': ['USE_NSS_CERTS=1'], 3093 'defines': ['USE_NSS_CERTS=1'],
3097 }], 3094 }],
3098 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', { 3095 ['<(chromeos)==1 and >(nacl_untrusted_build)==0', {
3099 'defines': ['OS_CHROMEOS=1'], 3096 'defines': ['OS_CHROMEOS=1'],
3100 }], 3097 }],
3101 ['enable_wexit_time_destructors==1 and OS!="win"', { 3098 ['enable_wexit_time_destructors==1 and OS!="win"', {
3102 # TODO: Enable on Windows too, http://crbug.com/404525 3099 # TODO: Enable on Windows too, http://crbug.com/404525
3103 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']}, 3100 'variables': { 'clang_warning_flags': ['-Wexit-time-destructors']},
3104 }], 3101 }],
3102 ['"<!(python <(DEPTH)/tools/clang/scripts/update.py --print-revision)"!="2 39674-1"', {
3103 # TODO(thakis): Move this to the global clang_warning_flags block once
3104 # clang is rolled far enough that the pinned clang understands this flag
3105 # TODO(thakis): Enable this, crbug.com/507717
3106 'variables': { 'clang_warning_flags': ['-Wno-shift-negative-value']},
3107 }],
3105 ['chromium_code==0', { 3108 ['chromium_code==0', {
3106 'variables': { 3109 'variables': {
3107 'clang_warning_flags': [ 3110 'clang_warning_flags': [
3108 # TODO(mgiuca): Move this suppression into individual third-party 3111 # TODO(mgiuca): Move this suppression into individual third-party
3109 # libraries as required. http://crbug.com/505301. 3112 # libraries as required. http://crbug.com/505301.
3110 '-Wno-overloaded-virtual', 3113 '-Wno-overloaded-virtual',
3111 ], 3114 ],
3112 }, 3115 },
3113 'conditions': [ 3116 'conditions': [
3114 [ 'os_posix==1 and OS!="mac" and OS!="ios"', { 3117 [ 'os_posix==1 and OS!="mac" and OS!="ios"', {
(...skipping 3086 matching lines...) Expand 10 before | Expand all | Expand 10 after
6201 # settings in target dicts. SYMROOT is a special case, because many other 6204 # settings in target dicts. SYMROOT is a special case, because many other
6202 # Xcode variables depend on it, including variables such as 6205 # Xcode variables depend on it, including variables such as
6203 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 6206 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
6204 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 6207 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
6205 # files to appear (when present) in the UI as actual files and not red 6208 # files to appear (when present) in the UI as actual files and not red
6206 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 6209 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
6207 # and therefore SYMROOT, needs to be set at the project level. 6210 # and therefore SYMROOT, needs to be set at the project level.
6208 'SYMROOT': '<(DEPTH)/xcodebuild', 6211 'SYMROOT': '<(DEPTH)/xcodebuild',
6209 }, 6212 },
6210 } 6213 }
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