Chiebot-Mirror
/
grpc
mirror of https://github.com/grpc/grpc.git
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Node: re-enable -Werror, clean up binding.gyp

Browse Source
pull/11708/head
murgatroid99 8 years ago
parent 1d85332481
commit 32de20ca49
2 changed files with 50 additions and 100 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 82
      binding.gyp
  2. 68
      templates/binding.gyp.template

82
binding.gyp
Unescape View File

@ -67,6 +67,14 @@
'ldflags': [ 'ldflags': [
'-g', '-g',
], ],
'cflags_c': [
'-Werror',
'-std=c99'
],
'cflags_cc': [
'-Werror',
'-std=c++11'
],
'include_dirs': [ 'include_dirs': [
'.', '.',
'include' 'include'
@ -164,6 +172,24 @@
'<(node_root_dir)/deps/zlib', '<(node_root_dir)/deps/zlib',
'<(node_root_dir)/deps/cares/include' '<(node_root_dir)/deps/cares/include'
] ]
}],
['OS == "mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9'
},
'OTHER_CFLAGS': [
'-g',
'-Wall',
'-Wextra',
'-Werror',
'-Wno-long-long',
'-Wno-unused-parameter',
'-DOSATOMIC_USE_INLINED=1',
],
'OTHER_CPLUSPLUSFLAGS': [
'-stdlib=libc++',
'-std=c++11'
],
}] }]
] ]
}, },
@ -171,12 +197,6 @@
['OS=="win" or runtime=="electron"', { ['OS=="win" or runtime=="electron"', {
'targets': [ 'targets': [
{ {
'cflags': [
'-std=c++11',
'-std=c99',
'-Wall',
'-Werror'
],
'target_name': 'boringssl', 'target_name': 'boringssl',
'product_prefix': 'lib', 'product_prefix': 'lib',
'type': 'static_library', 'type': 'static_library',
@ -488,17 +508,6 @@
'third_party/boringssl/ssl/tls_method.c', 'third_party/boringssl/ssl/tls_method.c',
'third_party/boringssl/ssl/tls_record.c', 'third_party/boringssl/ssl/tls_record.c',
], ],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9',
'OTHER_CPLUSPLUSFLAGS': [
'-stdlib=libc++',
'-std=c++11'
],
}
}],
],
}, },
], ],
}], }],
@ -536,11 +545,6 @@
'targets': [ 'targets': [
# Only want to compile zlib under Windows # Only want to compile zlib under Windows
{ {
'cflags': [
'-std=c99',
'-Wall',
'-Werror'
],
'target_name': 'z', 'target_name': 'z',
'product_prefix': 'lib', 'product_prefix': 'lib',
'type': 'static_library', 'type': 'static_library',
@ -569,11 +573,6 @@
], ],
'targets': [ 'targets': [
{ {
'cflags': [
'-std=c99',
'-Wall',
'-Werror'
],
'target_name': 'gpr', 'target_name': 'gpr',
'product_prefix': 'lib', 'product_prefix': 'lib',
'type': 'static_library', 'type': 'static_library',
@ -626,20 +625,8 @@
'src/core/lib/support/tmpfile_windows.c', 'src/core/lib/support/tmpfile_windows.c',
'src/core/lib/support/wrap_memcpy.c', 'src/core/lib/support/wrap_memcpy.c',
], ],
"conditions": [
['OS == "mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9'
}
}]
]
}, },
{ {
'cflags': [
'-std=c99',
'-Wall',
'-Werror'
],
'target_name': 'grpc', 'target_name': 'grpc',
'product_prefix': 'lib', 'product_prefix': 'lib',
'type': 'static_library', 'type': 'static_library',
@ -897,20 +884,12 @@
'src/core/ext/filters/workarounds/workaround_utils.c', 'src/core/ext/filters/workarounds/workaround_utils.c',
'src/core/plugin_registry/grpc_plugin_registry.c', 'src/core/plugin_registry/grpc_plugin_registry.c',
], ],
"conditions": [
['OS == "mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9'
}
}]
]
}, },
{ {
'include_dirs': [ 'include_dirs': [
"<!(node -e \"require('nan')\")" "<!(node -e \"require('nan')\")"
], ],
'cflags': [ 'cflags': [
'-std=c++11',
'-pthread', '-pthread',
'-zdefs', '-zdefs',
'-Wno-error=deprecated-declarations' '-Wno-error=deprecated-declarations'
@ -921,15 +900,6 @@
"boringssl", "boringssl",
] ]
}], }],
['OS=="mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9',
'OTHER_CFLAGS': [
'-stdlib=libc++',
'-std=c++11'
]
}
}],
['OS=="win"', { ['OS=="win"', {
'dependencies': [ 'dependencies': [
"z", "z",

68
templates/binding.gyp.template
Unescape View File

@ -64,6 +64,14 @@
], ],
% endif % endif
% endfor % endfor
'cflags_c': [
'-Werror',
'-std=c99'
],
'cflags_cc': [
'-Werror',
'-std=c++11'
],
'include_dirs': [ 'include_dirs': [
'.', '.',
'include' 'include'
@ -154,6 +162,22 @@
'<(node_root_dir)/deps/zlib', '<(node_root_dir)/deps/zlib',
'<(node_root_dir)/deps/cares/include' '<(node_root_dir)/deps/cares/include'
] ]
}],
['OS == "mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9'
},
% if defaults['global'].get('CPPFLAGS', None) is not None:
'OTHER_CFLAGS': [
% for item in defaults['global'].get('CPPFLAGS').split():
'${item}',
% endfor
],
'OTHER_CPLUSPLUSFLAGS': [
'-stdlib=libc++',
'-std=c++11'
],
% endif
}] }]
] ]
}, },
@ -164,12 +188,6 @@
% for lib in libs: % for lib in libs:
% if lib.name in module.transitive_deps and lib.name == 'boringssl': % if lib.name in module.transitive_deps and lib.name == 'boringssl':
{ {
'cflags': [
'-std=c++11',
'-std=c99',
'-Wall',
'-Werror'
],
'target_name': '${lib.name}', 'target_name': '${lib.name}',
'product_prefix': 'lib', 'product_prefix': 'lib',
'type': 'static_library', 'type': 'static_library',
@ -183,17 +201,6 @@
'${source}', '${source}',
% endfor % endfor
], ],
'conditions': [
['OS=="mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9',
'OTHER_CPLUSPLUSFLAGS': [
'-stdlib=libc++',
'-std=c++11'
],
}
}],
],
}, },
% endif % endif
% endfor % endfor
@ -237,11 +244,6 @@
% for lib in libs: % for lib in libs:
% if lib.name in module.transitive_deps and lib.name == 'z': % if lib.name in module.transitive_deps and lib.name == 'z':
{ {
'cflags': [
'-std=c99',
'-Wall',
'-Werror'
],
'target_name': '${lib.name}', 'target_name': '${lib.name}',
'product_prefix': 'lib', 'product_prefix': 'lib',
'type': 'static_library', 'type': 'static_library',
@ -267,11 +269,6 @@
% for lib in libs: % for lib in libs:
% if lib.name in module.transitive_deps and lib.name not in ('boringssl', 'z'): % if lib.name in module.transitive_deps and lib.name not in ('boringssl', 'z'):
{ {
'cflags': [
'-std=c99',
'-Wall',
'-Werror'
],
'target_name': '${lib.name}', 'target_name': '${lib.name}',
'product_prefix': 'lib', 'product_prefix': 'lib',
'type': 'static_library', 'type': 'static_library',
@ -285,13 +282,6 @@
'${source}', '${source}',
% endfor % endfor
], ],
"conditions": [
['OS == "mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9'
}
}]
]
}, },
% endif % endif
% endfor % endfor
@ -300,7 +290,6 @@
"<!(node -e \"require('nan')\")" "<!(node -e \"require('nan')\")"
], ],
'cflags': [ 'cflags': [
'-std=c++11',
'-pthread', '-pthread',
'-zdefs', '-zdefs',
'-Wno-error=deprecated-declarations' '-Wno-error=deprecated-declarations'
@ -315,15 +304,6 @@
% endfor % endfor
] ]
}], }],
['OS=="mac"', {
'xcode_settings': {
'MACOSX_DEPLOYMENT_TARGET': '10.9',
'OTHER_CFLAGS': [
'-stdlib=libc++',
'-std=c++11'
]
}
}],
['OS=="win"', { ['OS=="win"', {
'dependencies': [ 'dependencies': [
% for dep in getattr(module, 'deps', []): % for dep in getattr(module, 'deps', []):

Write Preview
Loading…
Cancel
Save