| OLD | NEW |
| 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 1636 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1647 }], | 1647 }], |
| 1648 ], | 1648 ], |
| 1649 }, | 1649 }, |
| 1650 }, | 1650 }, |
| 1651 'conditions': [ | 1651 'conditions': [ |
| 1652 ['os_posix==1 and OS!="mac"', { | 1652 ['os_posix==1 and OS!="mac"', { |
| 1653 'target_defaults': { | 1653 'target_defaults': { |
| 1654 # Enable -Werror by default, but put it in a variable so it can | 1654 # Enable -Werror by default, but put it in a variable so it can |
| 1655 # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 1655 # be disabled in ~/.gyp/include.gypi on the valgrind builders. |
| 1656 'variables': { | 1656 'variables': { |
| 1657 'conditions': [ | 1657 'werror%': '-Werror', |
| 1658 ['OS=="linux"', { | |
| 1659 'werror%': '-Werror', | |
| 1660 }, { # turn off -Werror on other Unices | |
| 1661 'werror%': '', | |
| 1662 }], | |
| 1663 ], | |
| 1664 }, | 1658 }, |
| 1665 'cflags': [ | 1659 'cflags': [ |
| 1666 '<(werror)', # See note above about the werror variable. | 1660 '<(werror)', # See note above about the werror variable. |
| 1667 '-pthread', | 1661 '-pthread', |
| 1668 '-fno-exceptions', | 1662 '-fno-exceptions', |
| 1669 '-fno-strict-aliasing', # See http://crbug.com/32204 | 1663 '-fno-strict-aliasing', # See http://crbug.com/32204 |
| 1670 '-Wall', | 1664 '-Wall', |
| 1671 # TODO(evan): turn this back on once all the builds work. | 1665 # TODO(evan): turn this back on once all the builds work. |
| 1672 # '-Wextra', | 1666 # '-Wextra', |
| 1673 # Don't warn about unused function params. We use those everywhere. | 1667 # Don't warn about unused function params. We use those everywhere. |
| (...skipping 1129 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 2803 # settings in target dicts. SYMROOT is a special case, because many other | 2797 # settings in target dicts. SYMROOT is a special case, because many other |
| 2804 # Xcode variables depend on it, including variables such as | 2798 # Xcode variables depend on it, including variables such as |
| 2805 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something | 2799 # PROJECT_DERIVED_FILE_DIR. When a source group corresponding to something |
| 2806 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the | 2800 # like PROJECT_DERIVED_FILE_DIR is added to a project, in order for the |
| 2807 # files to appear (when present) in the UI as actual files and not red | 2801 # files to appear (when present) in the UI as actual files and not red |
| 2808 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, | 2802 # red "missing file" proxies, the correct path to PROJECT_DERIVED_FILE_DIR, |
| 2809 # and therefore SYMROOT, needs to be set at the project level. | 2803 # and therefore SYMROOT, needs to be set at the project level. |
| 2810 'SYMROOT': '<(DEPTH)/xcodebuild', | 2804 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 2811 }, | 2805 }, |
| 2812 } | 2806 } |
| OLD | NEW |