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

Side by Side Diff: dart/runtime/tools/gyp/nss_configurations.gypi

Issue 11413141: Roll NSS to 169195. (Closed) Base URL: http://dart.googlecode.com/svn/branches/bleeding_edge/
Patch Set: Created 8 years, 1 month 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) 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 {
(...skipping 19 matching lines...) Expand all
30 '-Wno-pointer-to-int-cast', 30 '-Wno-pointer-to-int-cast',
31 '-UHAVE_CVAR_BUILT_ON_SEM', 31 '-UHAVE_CVAR_BUILT_ON_SEM',
32 ], 32 ],
33 # Removes these flags from the list cflags. 33 # Removes these flags from the list cflags.
34 'cflags!': [ 34 'cflags!': [
35 # NSS code from upstream mozilla builds with warnings, 35 # NSS code from upstream mozilla builds with warnings,
36 # so we must allow warnings without failing. 36 # so we must allow warnings without failing.
37 '-Werror', 37 '-Werror',
38 '-Wall', 38 '-Wall',
39 '-ansi', 39 '-ansi',
40 # This flag would let a certain assembly function be inlined,
Mads Ager (google) 2012/11/23 07:12:28 YAY!
41 # causing errors in mpcpucache.c.
42 '-fvisibility=hidden',
43 # Not supported for C, only for C++. 40 # Not supported for C, only for C++.
44 '-Wnon-virtual-dtor', 41 '-Wnon-virtual-dtor',
45 '-Wno-conversion-null', 42 '-Wno-conversion-null',
46 '-fno-rtti', 43 '-fno-rtti',
47 '-fvisibility-inlines-hidden', 44 '-fvisibility-inlines-hidden',
48 '-Woverloaded-virtual', 45 '-Woverloaded-virtual',
49 ], 46 ],
50 'configurations': { 47 'configurations': {
51 'Dart_Base': { 48 'Dart_Base': {
52 'xcode_settings': { 49 'xcode_settings': {
(...skipping 16 matching lines...) Expand all
69 'Dart_Release': { 66 'Dart_Release': {
70 'xcode_settings': { 67 'xcode_settings': {
71 # Remove 'ansi' setting. 68 # Remove 'ansi' setting.
72 'GCC_C_LANGUAGE_STANDARD': 'c99', 69 'GCC_C_LANGUAGE_STANDARD': 'c99',
73 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off 70 'GCC_TREAT_WARNINGS_AS_ERRORS': 'NO', # -Werror off
74 }, 71 },
75 }, 72 },
76 }, 73 },
77 }, 74 },
78 } 75 }
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698