Browse Source

win,node-gyp: make delay-load hook optional

The delay-load hook that was landed in 3d46fef to make compiled addons
work on Windows regardless of the iojs.exe/node.exe filename causes
issues with a small amount of compiled addons.

Therefore this patch makes it an opt-in feature. An addon may set the
'win_delay_load_hook' option to 'true' in its binding.gyp to enable this
feature.

Example:

```
{
  'targets': [
    {
      'target_name': 'ernie',
      'win_delay_load_hook': 'true',
      ...
```

Refs: https://github.com/iojs/io.js/pull/1251
PR-URL: https://github.com/iojs/io.js/pull/1266
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
v1.8.0-commit
Bert Belder 10 years ago
parent
commit
08acf1352c
  1. 37
      deps/npm/node_modules/node-gyp/addon.gypi

37
deps/npm/node_modules/node-gyp/addon.gypi

@ -1,7 +1,9 @@
{ {
'target_defaults': { 'target_defaults': {
'type': 'loadable_module', 'type': 'loadable_module',
'win_delay_load_hook': 'false',
'product_prefix': '', 'product_prefix': '',
'include_dirs': [ 'include_dirs': [
'<(node_root_dir)/src', '<(node_root_dir)/src',
'<(node_root_dir)/deps/uv/include', '<(node_root_dir)/deps/uv/include',
@ -13,11 +15,34 @@
'product_extension': 'node', 'product_extension': 'node',
'defines': [ 'BUILDING_NODE_EXTENSION' ], 'defines': [ 'BUILDING_NODE_EXTENSION' ],
}], }],
['_type=="static_library"', { ['_type=="static_library"', {
# set to `1` to *disable* the -T thin archive 'ld' flag. # set to `1` to *disable* the -T thin archive 'ld' flag.
# older linkers don't support this flag. # older linkers don't support this flag.
'standalone_static_library': '<(standalone_static_library)' 'standalone_static_library': '<(standalone_static_library)'
}], }],
['_win_delay_load_hook=="true"', {
# If the has the 'win_delay_load_hook' option set to 'true', link a
# delay-load hook into the DLL. That hook ensures that the addon
# will work regardless of whether the node/iojs binary is named
# node.exe, iojs.exe, or something else.
'conditions': [
[ 'OS=="win"', {
'sources': [
'src/win_delay_load_hook.c',
],
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': [ 'iojs.exe', 'node.exe' ],
# Don't print a linker warning when no imports from either .exe
# are used.
'AdditionalOptions': [ '/ignore:4199' ],
},
},
}],
],
}],
], ],
'conditions': [ 'conditions': [
@ -29,9 +54,6 @@
}, },
}], }],
[ 'OS=="win"', { [ 'OS=="win"', {
'sources': [
'src/win_delay_load_hook.c',
],
'libraries': [ 'libraries': [
'-lkernel32.lib', '-lkernel32.lib',
'-luser32.lib', '-luser32.lib',
@ -50,15 +72,6 @@
# warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent<T>' # warning C4251: 'node::ObjectWrap::handle_' : class 'v8::Persistent<T>'
# needs to have dll-interface to be used by clients of class 'node::ObjectWrap' # needs to have dll-interface to be used by clients of class 'node::ObjectWrap'
'msvs_disabled_warnings': [ 4251 ], 'msvs_disabled_warnings': [ 4251 ],
# Set up delay-loading for node.exe/iojs.exe so the loadable module
# will still be able to find it's imports if the binary is renamed.
'msvs_settings': {
'VCLinkerTool': {
'DelayLoadDLLs': [ 'iojs.exe', 'node.exe' ],
# Don't print a linker warning when no imports from either .exe are used.
'AdditionalOptions': [ '/ignore:4199' ],
}
},
}, { }, {
# OS!="win" # OS!="win"
'defines': [ '_LARGEFILE_SOURCE', '_FILE_OFFSET_BITS=64' ], 'defines': [ '_LARGEFILE_SOURCE', '_FILE_OFFSET_BITS=64' ],

Loading…
Cancel
Save