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

Side by Side Diff: build/common.gypi

Issue 12220089: Roll Clang r170392:r174491. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Rebase for realz Created 7 years, 10 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.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 2769 matching lines...) Expand 10 before | Expand all | Expand 10 after
2780 # removed when we change to that. (This is also why we don't 2780 # removed when we change to that. (This is also why we don't
2781 # bother fixing all these cases today.) 2781 # bother fixing all these cases today.)
2782 '-Wno-unnamed-type-template-args', 2782 '-Wno-unnamed-type-template-args',
2783 # This (rightfully) complains about 'override', which we use 2783 # This (rightfully) complains about 'override', which we use
2784 # heavily. 2784 # heavily.
2785 '-Wno-c++11-extensions', 2785 '-Wno-c++11-extensions',
2786 2786
2787 # Warns on switches on enums that cover all enum values but 2787 # Warns on switches on enums that cover all enum values but
2788 # also contain a default: branch. Chrome is full of that. 2788 # also contain a default: branch. Chrome is full of that.
2789 '-Wno-covered-switch-default', 2789 '-Wno-covered-switch-default',
2790
2791 # TODO(thakis,hans): Remove once Clang doesn't warn about false
2792 # positives in our code.
2793 '-Wno-undefined-internal',
2790 ], 2794 ],
2791 'cflags!': [ 2795 'cflags!': [
2792 # Clang doesn't seem to know know this flag. 2796 # Clang doesn't seem to know know this flag.
2793 '-mfpmath=sse', 2797 '-mfpmath=sse',
2794 ], 2798 ],
2795 }], 2799 }],
2796 ['clang==1 and clang_use_chrome_plugins==1', { 2800 ['clang==1 and clang_use_chrome_plugins==1', {
2797 'cflags': [ 2801 'cflags': [
2798 '<@(clang_chrome_plugins_flags)', 2802 '<@(clang_chrome_plugins_flags)',
2799 ], 2803 ],
(...skipping 564 matching lines...) Expand 10 before | Expand all | Expand 10 after
3364 3368
3365 # Don't die on dtoa code that uses a char as an array index. 3369 # Don't die on dtoa code that uses a char as an array index.
3366 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 3370 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
3367 '-Wno-char-subscripts', 3371 '-Wno-char-subscripts',
3368 # Clang spots more unused functions. 3372 # Clang spots more unused functions.
3369 '-Wno-unused-function', 3373 '-Wno-unused-function',
3370 3374
3371 # Warns on switches on enums that cover all enum values but 3375 # Warns on switches on enums that cover all enum values but
3372 # also contain a default: branch. Chrome is full of that. 3376 # also contain a default: branch. Chrome is full of that.
3373 '-Wno-covered-switch-default', 3377 '-Wno-covered-switch-default',
3378
3379 # TODO(thakis,hans): Remove once Clang doesn't warn about false
3380 # positives in our code.
3381 '-Wno-undefined-internal',
3374 ], 3382 ],
3375 'OTHER_CPLUSPLUSFLAGS': [ 3383 'OTHER_CPLUSPLUSFLAGS': [
3376 # gnu++11 instead of c++11 so that __ANSI_C__ doesn't get 3384 # gnu++11 instead of c++11 so that __ANSI_C__ doesn't get
3377 # defined. (Else e.g. finite() in base/float_util.h needs to 3385 # defined. (Else e.g. finite() in base/float_util.h needs to
3378 # be isfinite() which doesn't exist on the android bots.) 3386 # be isfinite() which doesn't exist on the android bots.)
3379 # typeof() is also disabled in c++11 (but we could use 3387 # typeof() is also disabled in c++11 (but we could use
3380 # decltype() instead). 3388 # decltype() instead).
3381 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all 3389 # TODO(thakis): Use CLANG_CXX_LANGUAGE_STANDARD instead once all
3382 # bots use xcode 4 -- http://crbug.com/147515). 3390 # bots use xcode 4 -- http://crbug.com/147515).
3383 # TODO(thakis): Eventually switch this to c++11 instead of 3391 # TODO(thakis): Eventually switch this to c++11 instead of
(...skipping 645 matching lines...) Expand 10 before | Expand all | Expand 10 after
4029 # settings in target dicts. SYMROOT is a special case, because many other 4037 # settings in target dicts. SYMROOT is a special case, because many other
4030 # Xcode variables depend on it, including variables such as 4038 # Xcode variables depend on it, including variables such as
4031 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 4039 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
4032 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 4040 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
4033 # files to appear (when present) in the UI as actual files and not red 4041 # files to appear (when present) in the UI as actual files and not red
4034 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 4042 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
4035 # and therefore SYMROOT, needs to be set at the project level. 4043 # and therefore SYMROOT, needs to be set at the project level.
4036 'SYMROOT': '<(DEPTH)/xcodebuild', 4044 'SYMROOT': '<(DEPTH)/xcodebuild',
4037 }, 4045 },
4038 } 4046 }
OLDNEW
« no previous file with comments | « no previous file | tools/clang/scripts/update.sh » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698