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

Side by Side Diff: build/common.gypi

Issue 7087028: roll clang 131935:132017 (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: rebase 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
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 1332 matching lines...) Expand 10 before | Expand all | Expand 10 after
1343 # http://code.google.com/p/googletest/source/detail?r=446 . 1343 # http://code.google.com/p/googletest/source/detail?r=446 .
1344 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ) 1344 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 )
1345 '-Wno-unnamed-type-template-args', 1345 '-Wno-unnamed-type-template-args',
1346 ], 1346 ],
1347 'cflags!': [ 1347 'cflags!': [
1348 # Clang doesn't seem to know know this flag. 1348 # Clang doesn't seem to know know this flag.
1349 '-mfpmath=sse', 1349 '-mfpmath=sse',
1350 ], 1350 ],
1351 }]], 1351 }]],
1352 }], 1352 }],
1353 ['clang==1 and chromeos==1', {
1354 'target_conditions': [
1355 ['_toolset=="target"', {
1356 'cflags': [
1357 # TODO(thakis): Remove this once all instances of this
1358 # are fixed in the views and chromeos code.
1359 # http://crbug.com/84424
1360 '-Wno-delete-non-virtual-dtor',
1361 ],
1362 }]],
1363 }],
1353 ['clang==1 and clang_use_chrome_plugins==1', { 1364 ['clang==1 and clang_use_chrome_plugins==1', {
1354 'target_conditions': [ 1365 'target_conditions': [
1355 ['_toolset=="target"', { 1366 ['_toolset=="target"', {
1356 'cflags': [ 1367 'cflags': [
1357 '<(clang_chrome_plugins_flags)', 1368 '<(clang_chrome_plugins_flags)',
1358 ], 1369 ],
1359 }]], 1370 }]],
1360 }], 1371 }],
1361 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { 1372 ['clang==1 and clang_load!="" and clang_add_plugin!=""', {
1362 'target_conditions': [ 1373 'target_conditions': [
(...skipping 395 matching lines...) Expand 10 before | Expand all | Expand 10 after
1758 # and therefore SYMROOT, needs to be set at the project level. 1769 # and therefore SYMROOT, needs to be set at the project level.
1759 'SYMROOT': '<(DEPTH)/xcodebuild', 1770 'SYMROOT': '<(DEPTH)/xcodebuild',
1760 }, 1771 },
1761 } 1772 }
1762 1773
1763 # Local Variables: 1774 # Local Variables:
1764 # tab-width:2 1775 # tab-width:2
1765 # indent-tabs-mode:nil 1776 # indent-tabs-mode:nil
1766 # End: 1777 # End:
1767 # vim: set expandtab tabstop=2 shiftwidth=2: 1778 # vim: set expandtab tabstop=2 shiftwidth=2:
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698