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

Side by Side Diff: build/common.gypi

Issue 9297028: roll clang 148039:148911 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 8 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 | chrome/common/mac/objc_zombie.mm » ('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 1927 matching lines...) Expand 10 before | Expand all | Expand 10 after
1938 # TODO(pkasting): In C++11 this is legal, so this should be 1938 # TODO(pkasting): In C++11 this is legal, so this should be
1939 # removed when we change to that. (This is also why we don't 1939 # removed when we change to that. (This is also why we don't
1940 # bother fixing all these cases today.) 1940 # bother fixing all these cases today.)
1941 '-Wno-unnamed-type-template-args', 1941 '-Wno-unnamed-type-template-args',
1942 # WebKit uses nullptr in a legit way, other that that this warning 1942 # WebKit uses nullptr in a legit way, other that that this warning
1943 # doesn't fire. 1943 # doesn't fire.
1944 '-Wno-c++11-compat', 1944 '-Wno-c++11-compat',
1945 # This (rightyfully) complains about 'override', which we use 1945 # This (rightyfully) complains about 'override', which we use
1946 # heavily. 1946 # heavily.
1947 '-Wno-c++11-extensions', 1947 '-Wno-c++11-extensions',
1948
1949 # Warns on switches on enums that cover all enum values but
1950 # also contain a default: branch. Chrome is full of that.
1951 '-Wno-covered-switch-default',
1952
1953 # TODO(thakis): Reenable once this no longer complains about
1954 # Invalid() in gmocks's gmock-internal-utils.h
1955 # http://crbug.com/111806
1956 '-Wno-null-dereference',
1948 ], 1957 ],
1949 'cflags!': [ 1958 'cflags!': [
1950 # Clang doesn't seem to know know this flag. 1959 # Clang doesn't seem to know know this flag.
1951 '-mfpmath=sse', 1960 '-mfpmath=sse',
1952 ], 1961 ],
1953 }], 1962 }],
1954 ['clang==1 and clang_use_chrome_plugins==1', { 1963 ['clang==1 and clang_use_chrome_plugins==1', {
1955 'cflags': [ 1964 'cflags': [
1956 '<(clang_chrome_plugins_flags)', 1965 '<(clang_chrome_plugins_flags)',
1957 ], 1966 ],
(...skipping 333 matching lines...) Expand 10 before | Expand all | Expand 10 after
2291 # Clang spots more unused functions. 2300 # Clang spots more unused functions.
2292 '-Wno-unused-function', 2301 '-Wno-unused-function',
2293 # See comments on this flag higher up in this file. 2302 # See comments on this flag higher up in this file.
2294 '-Wno-unnamed-type-template-args', 2303 '-Wno-unnamed-type-template-args',
2295 # WebKit uses nullptr in a legit way, other that that this 2304 # WebKit uses nullptr in a legit way, other that that this
2296 # warning doesn't fire. 2305 # warning doesn't fire.
2297 '-Wno-c++0x-compat', 2306 '-Wno-c++0x-compat',
2298 # This (rightyfully) complains about 'override', which we use 2307 # This (rightyfully) complains about 'override', which we use
2299 # heavily. 2308 # heavily.
2300 '-Wno-c++11-extensions', 2309 '-Wno-c++11-extensions',
2310
2311 # Warns on switches on enums that cover all enum values but
2312 # also contain a default: branch. Chrome is full of that.
2313 '-Wno-covered-switch-default',
2314
2315 # TODO(thakis): Reenable once this no longer complains about
2316 # Invalid() in gmock's gmock-internal-utils.h
2317 # http://crbug.com/111806
2318 '-Wno-null-dereference',
2301 ], 2319 ],
2302 }], 2320 }],
2303 ['clang==1 and clang_use_chrome_plugins==1', { 2321 ['clang==1 and clang_use_chrome_plugins==1', {
2304 'OTHER_CFLAGS': [ 2322 'OTHER_CFLAGS': [
2305 '<(clang_chrome_plugins_flags)', 2323 '<(clang_chrome_plugins_flags)',
2306 ], 2324 ],
2307 }], 2325 }],
2308 ['clang==1 and clang_load!=""', { 2326 ['clang==1 and clang_load!=""', {
2309 'OTHER_CFLAGS': [ 2327 'OTHER_CFLAGS': [
2310 '-Xclang', '-load', '-Xclang', '<(clang_load)', 2328 '-Xclang', '-load', '-Xclang', '<(clang_load)',
(...skipping 437 matching lines...) Expand 10 before | Expand all | Expand 10 after
2748 # settings in target dicts. SYMROOT is a special case, because many other 2766 # settings in target dicts. SYMROOT is a special case, because many other
2749 # Xcode variables depend on it, including variables such as 2767 # Xcode variables depend on it, including variables such as
2750 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2768 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2751 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2769 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2752 # files to appear (when present) in the UI as actual files and not red 2770 # files to appear (when present) in the UI as actual files and not red
2753 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2771 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2754 # and therefore SYMROOT, needs to be set at the project level. 2772 # and therefore SYMROOT, needs to be set at the project level.
2755 'SYMROOT': '<(DEPTH)/xcodebuild', 2773 'SYMROOT': '<(DEPTH)/xcodebuild',
2756 }, 2774 },
2757 } 2775 }
OLDNEW
« no previous file with comments | « no previous file | chrome/common/mac/objc_zombie.mm » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698