| OLD | NEW |
| 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 1335 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1346 # http://code.google.com/p/googletest/source/detail?r=446 . | 1346 # http://code.google.com/p/googletest/source/detail?r=446 . |
| 1347 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ) | 1347 # TODO(thakis): Use -isystem instead (http://crbug.com/58751 ) |
| 1348 '-Wno-unnamed-type-template-args', | 1348 '-Wno-unnamed-type-template-args', |
| 1349 ], | 1349 ], |
| 1350 'cflags!': [ | 1350 'cflags!': [ |
| 1351 # Clang doesn't seem to know know this flag. | 1351 # Clang doesn't seem to know know this flag. |
| 1352 '-mfpmath=sse', | 1352 '-mfpmath=sse', |
| 1353 ], | 1353 ], |
| 1354 }]], | 1354 }]], |
| 1355 }], | 1355 }], |
| 1356 ['clang==1 and chromeos==1', { | |
| 1357 'target_conditions': [ | |
| 1358 ['_toolset=="target"', { | |
| 1359 'cflags': [ | |
| 1360 # TODO(thakis): Remove this once all instances of this | |
| 1361 # are fixed in the views and chromeos code. | |
| 1362 # http://crbug.com/84424 | |
| 1363 # TODO(thakis): Add back in when rolling clang past r131989 | |
| 1364 '-Wno-delete-non-virtual-dtor', | |
| 1365 ], | |
| 1366 }]], | |
| 1367 }], | |
| 1368 ['clang==1 and clang_use_chrome_plugins==1', { | 1356 ['clang==1 and clang_use_chrome_plugins==1', { |
| 1369 'target_conditions': [ | 1357 'target_conditions': [ |
| 1370 ['_toolset=="target"', { | 1358 ['_toolset=="target"', { |
| 1371 'cflags': [ | 1359 'cflags': [ |
| 1372 '<(clang_chrome_plugins_flags)', | 1360 '<(clang_chrome_plugins_flags)', |
| 1373 ], | 1361 ], |
| 1374 }]], | 1362 }]], |
| 1375 }], | 1363 }], |
| 1376 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { | 1364 ['clang==1 and clang_load!="" and clang_add_plugin!=""', { |
| 1377 'target_conditions': [ | 1365 'target_conditions': [ |
| (...skipping 398 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1776 # and therefore SYMROOT, needs to be set at the project level. | 1764 # and therefore SYMROOT, needs to be set at the project level. |
| 1777 'SYMROOT': '<(DEPTH)/xcodebuild', | 1765 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 1778 }, | 1766 }, |
| 1779 } | 1767 } |
| 1780 | 1768 |
| 1781 # Local Variables: | 1769 # Local Variables: |
| 1782 # tab-width:2 | 1770 # tab-width:2 |
| 1783 # indent-tabs-mode:nil | 1771 # indent-tabs-mode:nil |
| 1784 # End: | 1772 # End: |
| 1785 # vim: set expandtab tabstop=2 shiftwidth=2: | 1773 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |