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

Side by Side Diff: build/common.gypi

Issue 9007051: roll clang 146361:147225 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: -Wno-format on linux Created 9 years 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) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 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 1944 matching lines...) Expand 10 before | Expand all | Expand 10 after
1955 # TODO(pkasting): In C++11 this is legal, so this should be 1955 # TODO(pkasting): In C++11 this is legal, so this should be
1956 # removed when we change to that. (This is also why we don't 1956 # removed when we change to that. (This is also why we don't
1957 # bother fixing all these cases today.) 1957 # bother fixing all these cases today.)
1958 '-Wno-unnamed-type-template-args', 1958 '-Wno-unnamed-type-template-args',
1959 # WebKit uses nullptr in a legit way, other that that this warning 1959 # WebKit uses nullptr in a legit way, other that that this warning
1960 # doesn't fire. 1960 # doesn't fire.
1961 '-Wno-c++11-compat', 1961 '-Wno-c++11-compat',
1962 # This (rightyfully) complains about 'override', which we use 1962 # This (rightyfully) complains about 'override', which we use
1963 # heavily. 1963 # heavily.
1964 '-Wno-c++11-extensions', 1964 '-Wno-c++11-extensions',
1965 # TODO(thakis): Reenable this once clang stops complaining about
1966 # %as in format strings.
1967 '-Wno-format',
Nico 2011/12/24 01:22:52 This is for this line in chrome/browser/memory_det
1965 ], 1968 ],
1966 'cflags!': [ 1969 'cflags!': [
1967 # Clang doesn't seem to know know this flag. 1970 # Clang doesn't seem to know know this flag.
1968 '-mfpmath=sse', 1971 '-mfpmath=sse',
1969 ], 1972 ],
1970 }], 1973 }],
1971 ['clang==1 and clang_use_chrome_plugins==1', { 1974 ['clang==1 and clang_use_chrome_plugins==1', {
1972 'cflags': [ 1975 'cflags': [
1973 '<(clang_chrome_plugins_flags)', 1976 '<(clang_chrome_plugins_flags)',
1974 ], 1977 ],
(...skipping 312 matching lines...) Expand 10 before | Expand all | Expand 10 after
2287 '-Wno-missing-field-initializers', 2290 '-Wno-missing-field-initializers',
2288 ], 2291 ],
2289 'conditions': [ 2292 'conditions': [
2290 ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'}, 2293 ['chromium_mac_pch', {'GCC_PRECOMPILE_PREFIX_HEADER': 'YES'},
2291 {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'} 2294 {'GCC_PRECOMPILE_PREFIX_HEADER': 'NO'}
2292 ], 2295 ],
2293 ['clang==1', { 2296 ['clang==1', {
2294 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang', 2297 'CC': '$(SOURCE_ROOT)/<(clang_dir)/clang',
2295 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++', 2298 'LDPLUSPLUS': '$(SOURCE_ROOT)/<(clang_dir)/clang++',
2296 2299
2297 » # Don't use -Wc++0x-extensions, which Xcode 4 enables by default 2300 # Don't use -Wc++0x-extensions, which Xcode 4 enables by default
2298 » # when buliding with clang. This warning is triggered when the 2301 # when buliding with clang. This warning is triggered when the
2299 » # override keyword is used via the OVERRIDE macro from 2302 # override keyword is used via the OVERRIDE macro from
2300 » # base/compiler_specific.h. 2303 # base/compiler_specific.h.
2301 » 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO', 2304 'CLANG_WARN_CXX0X_EXTENSIONS': 'NO',
2302 2305
2303 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', 2306 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0',
2304 'WARNING_CFLAGS': [ 2307 'WARNING_CFLAGS': [
2305 '-Wheader-hygiene', 2308 '-Wheader-hygiene',
2306 # Don't die on dtoa code that uses a char as an array index. 2309 # Don't die on dtoa code that uses a char as an array index.
2307 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 2310 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
2308 '-Wno-char-subscripts', 2311 '-Wno-char-subscripts',
2309 # Clang spots more unused functions. 2312 # Clang spots more unused functions.
2310 '-Wno-unused-function', 2313 '-Wno-unused-function',
2311 # See comments on this flag higher up in this file. 2314 # See comments on this flag higher up in this file.
(...skipping 447 matching lines...) Expand 10 before | Expand all | Expand 10 after
2759 # settings in target dicts. SYMROOT is a special case, because many other 2762 # settings in target dicts. SYMROOT is a special case, because many other
2760 # Xcode variables depend on it, including variables such as 2763 # Xcode variables depend on it, including variables such as
2761 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something 2764 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something
2762 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the 2765 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the
2763 # files to appear (when present) in the UI as actual files and not red 2766 # files to appear (when present) in the UI as actual files and not red
2764 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, 2767 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR,
2765 # and therefore SYMROOT, needs to be set at the project level. 2768 # and therefore SYMROOT, needs to be set at the project level.
2766 'SYMROOT': '<(DEPTH)/xcodebuild', 2769 'SYMROOT': '<(DEPTH)/xcodebuild',
2767 }, 2770 },
2768 } 2771 }
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