Skip to content

Commit

Permalink
fix(NODE-6320): macos runtime linking name conflict with SSL (#193)
Browse files Browse the repository at this point in the history
  • Loading branch information
nbbeeken authored Aug 12, 2024
1 parent c2acb18 commit d382b56
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
2 changes: 2 additions & 0 deletions .github/scripts/build.mjs
Original file line number Diff line number Diff line change
Expand Up @@ -87,6 +87,8 @@ async function buildBindings(args, pkg) {
const x64Tar = `kerberos-v${pkg.version}-napi-v4-darwin-x64.tar.gz`;
await fs.copyFile(resolveRoot('prebuilds', armTar), resolveRoot('prebuilds', x64Tar));
}

await run('node', ['--print', `require('.')`], { cwd: resolveRoot() })
}

async function main() {
Expand Down
4 changes: 2 additions & 2 deletions binding.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@
'src/unix/kerberos_unix.cc'
]
}],
['(OS=="mac" or OS=="linux") and (kerberos_use_rtld!="true")', {
['(OS=="mac") or (OS=="linux" and kerberos_use_rtld!="true")', {
'link_settings': {
'libraries': [
'-lkrb5',
Expand All @@ -78,7 +78,7 @@
}]
]
}],
['(OS=="mac" or OS=="linux") and (kerberos_use_rtld=="true")', {
['(OS=="linux") and (kerberos_use_rtld=="true")', {
'defines': ['KERBEROS_USE_RTLD=1'],
'link_settings': {
'libraries': [
Expand Down

0 comments on commit d382b56

Please sign in to comment.