diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2021-06-21 23:24:01 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2021-06-22 21:43:03 +0000 |
| commit | e3ba5a35ed20eebe21dedcad2ceb021b467bf2cc (patch) | |
| tree | 14e39c5cfa62063fdffd663b1139365b16aec1a2 /etc/scons | |
| parent | 686dad084a738a44c2a298a98a21bdb81f0fe683 (diff) | |
| download | mongo-e3ba5a35ed20eebe21dedcad2ceb021b467bf2cc.tar.gz | |
SERVER-57396 promote visibility from experimental status
Diffstat (limited to 'etc/scons')
| -rw-r--r-- | etc/scons/xcode_macosx.vars | 4 | ||||
| -rw-r--r-- | etc/scons/xcode_macosx_arm.vars | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/etc/scons/xcode_macosx.vars b/etc/scons/xcode_macosx.vars index 10d8bdc361f..0fa08246d14 100644 --- a/etc/scons/xcode_macosx.vars +++ b/etc/scons/xcode_macosx.vars @@ -8,8 +8,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'clang++']).dec DSYMUTIL = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'dsymutil']).decode('utf-8').strip() STRIP = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'strip']).decode('utf-8').strip() -experimental_visibility_support = SCons.Script.Main.GetOption('experimental-visibility-support') -if experimental_visibility_support == "on": +visibility_support = SCons.Script.Main.GetOption('visibility-support') +if visibility_support != "off" and SCons.Script.Main.GetOption('link-model').startswith('dynamic'): TAPI = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'tapi']).decode('utf-8').strip() sdk_path = subprocess.check_output(['xcrun', '--sdk', 'macosx', '--show-sdk-path']).decode('utf-8').strip() diff --git a/etc/scons/xcode_macosx_arm.vars b/etc/scons/xcode_macosx_arm.vars index 246ab0f349d..a0077e693ae 100644 --- a/etc/scons/xcode_macosx_arm.vars +++ b/etc/scons/xcode_macosx_arm.vars @@ -8,8 +8,8 @@ CXX = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'clang++']).dec DSYMUTIL = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'dsymutil']).decode('utf-8').strip() STRIP = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'strip']).decode('utf-8').strip() -experimental_visibility_support = SCons.Script.Main.GetOption('experimental-visibility-support') -if experimental_visibility_support == "on": +visibility_support = SCons.Script.Main.GetOption('visibility-support') +if visibility_support != "off" and SCons.Script.Main.GetOption('link-model').startswith('dynamic'): TAPI = subprocess.check_output(['xcrun', '-f', '--sdk', 'macosx', 'tapi']).decode('utf-8').strip() sdk_path = subprocess.check_output(['xcrun', '--sdk', 'macosx', '--show-sdk-path']).decode('utf-8').strip() |