| 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 1067 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1078 }, | 1078 }, |
| 1079 'conditions': [ | 1079 'conditions': [ |
| 1080 ['os_posix==1 and OS!="mac"', { | 1080 ['os_posix==1 and OS!="mac"', { |
| 1081 'target_defaults': { | 1081 'target_defaults': { |
| 1082 # Enable -Werror by default, but put it in a variable so it can | 1082 # Enable -Werror by default, but put it in a variable so it can |
| 1083 # be disabled in ~/.gyp/include.gypi on the valgrind builders. | 1083 # be disabled in ~/.gyp/include.gypi on the valgrind builders. |
| 1084 'variables': { | 1084 'variables': { |
| 1085 # Use -fno-strict-aliasing, see http://crbug.com/32204 | 1085 # Use -fno-strict-aliasing, see http://crbug.com/32204 |
| 1086 'no_strict_aliasing%': 1, | 1086 'no_strict_aliasing%': 1, |
| 1087 'conditions': [ | 1087 'conditions': [ |
| 1088 ['OS=="linux"', { | 1088 # Disabled for GCC 4.6; see http://crbug.com/80071 |
| 1089 ['OS=="linux" and gcc_version!=46', { |
| 1089 'werror%': '-Werror', | 1090 'werror%': '-Werror', |
| 1090 }, { # turn off -Werror on other Unices | 1091 }, { # turn off -Werror on other Unices |
| 1091 'werror%': '', | 1092 'werror%': '', |
| 1092 }], | 1093 }], |
| 1093 ], | 1094 ], |
| 1094 }, | 1095 }, |
| 1095 'cflags': [ | 1096 'cflags': [ |
| 1096 '<(werror)', # See note above about the werror variable. | 1097 '<(werror)', # See note above about the werror variable. |
| 1097 '-pthread', | 1098 '-pthread', |
| 1098 '-fno-exceptions', | 1099 '-fno-exceptions', |
| (...skipping 660 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... |
| 1759 # and therefore SYMROOT, needs to be set at the project level. | 1760 # and therefore SYMROOT, needs to be set at the project level. |
| 1760 'SYMROOT': '<(DEPTH)/xcodebuild', | 1761 'SYMROOT': '<(DEPTH)/xcodebuild', |
| 1761 }, | 1762 }, |
| 1762 } | 1763 } |
| 1763 | 1764 |
| 1764 # Local Variables: | 1765 # Local Variables: |
| 1765 # tab-width:2 | 1766 # tab-width:2 |
| 1766 # indent-tabs-mode:nil | 1767 # indent-tabs-mode:nil |
| 1767 # End: | 1768 # End: |
| 1768 # vim: set expandtab tabstop=2 shiftwidth=2: | 1769 # vim: set expandtab tabstop=2 shiftwidth=2: |
| OLD | NEW |