From d382b56f2e55dab25a003c416925ba2967761a72 Mon Sep 17 00:00:00 2001 From: Neal Beeken Date: Mon, 12 Aug 2024 10:55:49 -0400 Subject: [PATCH] fix(NODE-6320): macos runtime linking name conflict with SSL (#193) --- .github/scripts/build.mjs | 2 ++ binding.gyp | 4 ++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/.github/scripts/build.mjs b/.github/scripts/build.mjs index c8602021..fee3640e 100644 --- a/.github/scripts/build.mjs +++ b/.github/scripts/build.mjs @@ -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() { diff --git a/binding.gyp b/binding.gyp index 1eb34762..050ee707 100644 --- a/binding.gyp +++ b/binding.gyp @@ -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', @@ -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': [