Skip to content

Commit

Permalink
build: export zlib symbols on Windows
Browse files Browse the repository at this point in the history
Base the generated openssl.def on existing zlib.def. We cannot specify
more than one DEF file per executable so we need to merge the two DEF
files to expose both OpenSSL and Zlib functionality to addons.

If OpenSSL is not used, link against zlib.def itself.

PR-URL: #7983
Reviewed-By: Ben Noordhuis <info@bnoordhuis.nl>
Reviewed-By: James M Snell <jasnell@gmail.com>
  • Loading branch information
Alex Hultman authored and cjihrig committed Aug 10, 2016
1 parent a385277 commit c843e58
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 0 deletions.
7 changes: 7 additions & 0 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -372,9 +372,14 @@
'-Wl,--no-whole-archive',
],
}],
# openssl.def is based on zlib.def, zlib symbols
# are always exported.
['use_openssl_def==1', {
'sources': ['<(SHARED_INTERMEDIATE_DIR)/openssl.def'],
}],
['OS=="win" and use_openssl_def==0', {
'sources': ['deps/zlib/win32/zlib.def'],
}],
],
}],
],
Expand Down Expand Up @@ -570,6 +575,8 @@
'-X^DSO',
'-X^_',
'-X^private_',
# Base generated DEF on zlib.def
'-Bdeps/zlib/win32/zlib.def'
],
},
'conditions': [
Expand Down
9 changes: 9 additions & 0 deletions tools/mkssldef.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
categories = []
defines = []
excludes = []
bases = []

if __name__ == '__main__':
out = sys.stdout
Expand All @@ -18,6 +19,7 @@
elif option.startswith('-C'): categories += option[2:].split(',')
elif option.startswith('-D'): defines += option[2:].split(',')
elif option.startswith('-X'): excludes += option[2:].split(',')
elif option.startswith('-B'): bases += option[2:].split(',')

excludes = map(re.compile, excludes)
exported = []
Expand All @@ -40,5 +42,12 @@ def test(expr):
if not satisfy(meta[3], categories): continue
exported.append(name)

for filename in bases:
for line in open(filename).readlines():
line = line.strip()
if line == 'EXPORTS': continue
if line[0] == ';': continue
exported.append(line)

print('EXPORTS', file=out)
for name in sorted(exported): print(' ', name, file=out)

0 comments on commit c843e58

Please sign in to comment.