Skip to content

Commit d382b56

Browse files
authored
fix(NODE-6320): macos runtime linking name conflict with SSL (#193)
1 parent c2acb18 commit d382b56

File tree

2 files changed

+4
-2
lines changed

2 files changed

+4
-2
lines changed

.github/scripts/build.mjs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -87,6 +87,8 @@ async function buildBindings(args, pkg) {
8787
const x64Tar = `kerberos-v${pkg.version}-napi-v4-darwin-x64.tar.gz`;
8888
await fs.copyFile(resolveRoot('prebuilds', armTar), resolveRoot('prebuilds', x64Tar));
8989
}
90+
91+
await run('node', ['--print', `require('.')`], { cwd: resolveRoot() })
9092
}
9193

9294
async function main() {

binding.gyp

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,7 @@
6161
'src/unix/kerberos_unix.cc'
6262
]
6363
}],
64-
['(OS=="mac" or OS=="linux") and (kerberos_use_rtld!="true")', {
64+
['(OS=="mac") or (OS=="linux" and kerberos_use_rtld!="true")', {
6565
'link_settings': {
6666
'libraries': [
6767
'-lkrb5',
@@ -78,7 +78,7 @@
7878
}]
7979
]
8080
}],
81-
['(OS=="mac" or OS=="linux") and (kerberos_use_rtld=="true")', {
81+
['(OS=="linux") and (kerberos_use_rtld=="true")', {
8282
'defines': ['KERBEROS_USE_RTLD=1'],
8383
'link_settings': {
8484
'libraries': [

0 commit comments

Comments
 (0)