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

Side by Side Diff: build/common.gypi

Issue 7046048: Roll clang 131950:132735 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: . Created 9 years, 6 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) 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 1346 matching lines...) Expand 10 before | Expand all | Expand 10 after
1357 }]], 1357 }]],
1358 }], 1358 }],
1359 ['clang==1 and chromeos==1', { 1359 ['clang==1 and chromeos==1', {
1360 'target_conditions': [ 1360 'target_conditions': [
1361 ['_toolset=="target"', { 1361 ['_toolset=="target"', {
1362 'cflags': [ 1362 'cflags': [
1363 # TODO(thakis): Remove this once all instances of this 1363 # TODO(thakis): Remove this once all instances of this
1364 # are fixed in the views and chromeos code. 1364 # are fixed in the views and chromeos code.
1365 # http://crbug.com/84424 1365 # http://crbug.com/84424
1366 # TODO(thakis): Add back in when rolling clang past r131989 1366 # TODO(thakis): Add back in when rolling clang past r131989
1367 #'-Wno-delete-non-virtual-dtor', 1367 '-Wno-delete-non-virtual-dtor',
1368 ], 1368 ],
1369 }]], 1369 }]],
1370 }], 1370 }],
1371 ['clang==1 and clang_use_chrome_plugins==1', { 1371 ['clang==1 and clang_use_chrome_plugins==1', {
1372 'target_conditions': [ 1372 'target_conditions': [
1373 ['_toolset=="target"', { 1373 ['_toolset=="target"', {
1374 'cflags': [ 1374 'cflags': [
1375 '<(clang_chrome_plugins_flags)', 1375 '<(clang_chrome_plugins_flags)',
1376 ], 1376 ],
1377 }]], 1377 }]],
(...skipping 98 matching lines...) Expand 10 before | Expand all | Expand 10 after
1476 '-Wheader-hygiene', 1476 '-Wheader-hygiene',
1477 # Don't die on dtoa code that uses a char as an array index. 1477 # Don't die on dtoa code that uses a char as an array index.
1478 # This is required solely for base/third_party/dmg_fp/dtoa.cc. 1478 # This is required solely for base/third_party/dmg_fp/dtoa.cc.
1479 '-Wno-char-subscripts', 1479 '-Wno-char-subscripts',
1480 # Clang spots more unused functions. 1480 # Clang spots more unused functions.
1481 '-Wno-unused-function', 1481 '-Wno-unused-function',
1482 # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see 1482 # Survive EXPECT_EQ(unnamed_enum, unsigned int) -- see
1483 # http://code.google.com/p/googletest/source/detail?r=446 . 1483 # http://code.google.com/p/googletest/source/detail?r=446 .
1484 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ). 1484 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ).
1485 '-Wno-unnamed-type-template-args', 1485 '-Wno-unnamed-type-template-args',
1486 # TODO(thakis): Reenable once the one instance this warns on
1487 # is fixed.
1488 '-Wno-parentheses',
1486 ], 1489 ],
1487 'OTHER_CFLAGS': [ 1490 'OTHER_CFLAGS': [
1488 # TODO(thakis): Causes many warnings - http://crbug.com/75001 1491 # TODO(thakis): Causes many warnings - http://crbug.com/75001
1489 '-fobjc-exceptions', 1492 '-fobjc-exceptions',
1490 ], 1493 ],
1491 }], 1494 }],
1492 ['clang==1 and clang_use_chrome_plugins==1', { 1495 ['clang==1 and clang_use_chrome_plugins==1', {
1493 'OTHER_CFLAGS': [ 1496 'OTHER_CFLAGS': [
1494 '<(clang_chrome_plugins_flags)', 1497 '<(clang_chrome_plugins_flags)',
1495 ], 1498 ],
(...skipping 280 matching lines...) Expand 10 before | Expand all | Expand 10 after
1776 # and therefore SYMROOT, needs to be set at the project level. 1779 # and therefore SYMROOT, needs to be set at the project level.
1777 'SYMROOT': '<(DEPTH)/xcodebuild', 1780 'SYMROOT': '<(DEPTH)/xcodebuild',
1778 }, 1781 },
1779 } 1782 }
1780 1783
1781 # Local Variables: 1784 # Local Variables:
1782 # tab-width:2 1785 # tab-width:2
1783 # indent-tabs-mode:nil 1786 # indent-tabs-mode:nil
1784 # End: 1787 # End:
1785 # vim: set expandtab tabstop=2 shiftwidth=2: 1788 # vim: set expandtab tabstop=2 shiftwidth=2:
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