| OLD | NEW |
| 1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file | 1 # Copyright (c) 2012, the Dart project authors. Please see the AUTHORS file |
| 2 # for details. All rights reserved. Use of this source code is governed by a | 2 # for details. All rights reserved. Use of this source code is governed by a |
| 3 # BSD-style license that can be found in the LICENSE file. | 3 # BSD-style license that can be found in the LICENSE file. |
| 4 | 4 |
| 5 # This file is included to modify the configurations to build third-party | 5 # This file is included to modify the configurations to build third-party |
| 6 # code from Mozilla's NSS and NSPR libraries, modified by the Chromium project. | 6 # code from Mozilla's NSS and NSPR libraries, modified by the Chromium project. |
| 7 # This code is C code, not C++, and is not warning-free, so we need to remove | 7 # This code is C code, not C++, and is not warning-free, so we need to remove |
| 8 # C++-specific flags, and add flags to supress the warnings in the code. | 8 # C++-specific flags, and add flags to supress the warnings in the code. |
| 9 # This file is included from gyp files in the runtime/bin/net directory. | 9 # This file is included from gyp files in the runtime/bin/net directory. |
| 10 { | 10 { |
| 11 'variables': { | 11 'variables': { |
| 12 # Used by third_party/nss, which is from Chromium. | 12 # Used by third_party/nss, which is from Chromium. |
| 13 # Include the built-in set of root certificate authorities. | 13 # Include the built-in set of root certificate authorities. |
| 14 'exclude_nss_root_certs': 0, | 14 'exclude_nss_root_certs': 0, |
| 15 'os_posix%': 1, | 15 'os_posix%': 1, |
| 16 'os_bsd%': 0, | 16 'os_bsd%': 0, |
| 17 'chromeos%': 0, | 17 'chromeos%': 0, |
| 18 'clang%': 0, | 18 'clang%': 0, |
| 19 }, | 19 }, |
| 20 'target_defaults': { | 20 'target_defaults': { |
| 21 'cflags': [ | 21 'cflags': [ |
| 22 '-Wno-unused-variable', | 22 '-w', |
| 23 '-Wno-unused-but-set-variable', | |
| 24 '-Wno-missing-field-initializers', | |
| 25 '-Wno-uninitialized', | |
| 26 '-Wno-sign-compare', | |
| 27 '-Wno-empty-body', | |
| 28 '-Wno-type-limits', | |
| 29 '-Wno-pointer-to-int-cast', | |
| 30 '-UHAVE_CVAR_BUILT_ON_SEM', | 23 '-UHAVE_CVAR_BUILT_ON_SEM', |
| 31 ], | 24 ], |
| 32 # Removes these flags from the list cflags. | 25 # Removes these flags from the list cflags. |
| 33 'cflags!': [ | 26 'cflags!': [ |
| 34 # NSS code from upstream mozilla builds with warnings, | 27 # NSS code from upstream mozilla builds with warnings, |
| 35 # so we must allow warnings without failing. | 28 # so we must allow warnings without failing. |
| 36 '-Werror', | 29 '-Werror', |
| 37 '-Wall', | 30 '-Wall', |
| 38 '-ansi', | 31 '-ansi', |
| 39 # Not supported for C, only for C++. | 32 # Not supported for C, only for C++. |
| 40 '-Wnon-virtual-dtor', | 33 '-Wnon-virtual-dtor', |
| 41 '-Wno-conversion-null', | 34 '-Wno-conversion-null', |
| 42 '-fno-rtti', | 35 '-fno-rtti', |
| 43 '-fvisibility-inlines-hidden', | 36 '-fvisibility-inlines-hidden', |
| 44 '-Woverloaded-virtual', | 37 '-Woverloaded-virtual', |
| 45 ], | 38 ], |
| 46 'configurations': { | 39 'configurations': { |
| 47 'Dart_Base': { | 40 'Dart_Base': { |
| 48 'xcode_settings': { | 41 'xcode_settings': { |
| 42 'WARNING_CFLAGS': [ |
| 43 '-w', |
| 44 ], |
| 49 'WARNING_CFLAGS!': [ | 45 'WARNING_CFLAGS!': [ |
| 50 '-Wall', | 46 '-Wall', |
| 51 '-Wextra', | 47 '-Wextra', |
| 52 ], | 48 ], |
| 53 }, | 49 }, |
| 54 }, | 50 }, |
| 55 # Dart_Debug and Dart_Release are merged after Dart_Base, so we can | 51 # Dart_Debug and Dart_Release are merged after Dart_Base, so we can |
| 56 # override the 'ansi' and '-Werror' flags set at the global level in | 52 # override the 'ansi' and '-Werror' flags set at the global level in |
| 57 # tools/gyp/configurations_xcode.gypi. | 53 # tools/gyp/configurations_xcode.gypi. |
| 58 'Dart_Debug': { | 54 'Dart_Debug': { |
| 59 'xcode_settings': { | 55 'xcode_settings': { |
| 60 # Remove 'ansi' setting. | 56 # Remove 'ansi' setting. |
| 61 'GCC_C_LANGUAGE_STANDARD': 'c99', | 57 'GCC_C_LANGUAGE_STANDARD': 'c99', |
| 62 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off | 58 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off |
| 63 }, | 59 }, |
| 64 }, | 60 }, |
| 65 'Dart_Release': { | 61 'Dart_Release': { |
| 66 'xcode_settings': { | 62 'xcode_settings': { |
| 67 # Remove 'ansi' setting. | 63 # Remove 'ansi' setting. |
| 68 'GCC_C_LANGUAGE_STANDARD': 'c99', | 64 'GCC_C_LANGUAGE_STANDARD': 'c99', |
| 69 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off | 65 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off |
| 70 }, | 66 }, |
| 71 }, | 67 }, |
| 72 }, | 68 }, |
| 73 }, | 69 }, |
| 74 } | 70 } |
| OLD | NEW |