diff options
| author | Daniel Moody <daniel.moody@mongodb.com> | 2022-06-24 01:17:19 -0500 |
|---|---|---|
| committer | Evergreen Agent <no-reply@evergreen.mongodb.com> | 2022-06-24 06:45:43 +0000 |
| commit | a9bc1f1a105d9f86544f6bf3899072d7c78af6a6 (patch) | |
| tree | 6e5f7f75d4a504d43e6b7ba27dd3277c9ba889da | |
| parent | 3822c3b796cc5d2c5b176505138134f58dd1e332 (diff) | |
| download | mongo-a9bc1f1a105d9f86544f6bf3899072d7c78af6a6.tar.gz | |
SERVER-63616 fix link model check for macos dynamic linking
| -rw-r--r-- | SConstruct | 4 | ||||
| -rw-r--r-- | etc/evergreen_yml_components/definitions.yml | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/SConstruct b/SConstruct index 4f0981ed9e0..ffee0c3322d 100644 --- a/SConstruct +++ b/SConstruct @@ -1866,12 +1866,12 @@ if link_model.startswith('dynamic') and get_option('install-action') == 'symlink f"Options '--link-model={link_model}' not supported with '--install-action={get_option('install-action')}'." ) -if link_model.startswith('dynamic') and env.TargetOSIs( +if link_model == 'dynamic' and env.TargetOSIs( 'darwin') and not get_option('force-macos-dynamic-link'): macos_version_message = textwrap.dedent("""\ link-model=dynamic us only supported on macos version 12 or higher. - This is due to a 512 dylib limit on older macos. See this post for + This is due to a 512 dylib RUNTIME limit on older macos. See this post for more information: https://developer.apple.com/forums//thread/708366?login=true&page=1#717495022 Use '--force-macos-dynamic-link' to bypass this check. """) diff --git a/etc/evergreen_yml_components/definitions.yml b/etc/evergreen_yml_components/definitions.yml index 016fdb03d61..e03094af84d 100644 --- a/etc/evergreen_yml_components/definitions.yml +++ b/etc/evergreen_yml_components/definitions.yml @@ -2390,6 +2390,7 @@ tasks: vars: task_compile_flags: >- --link-model=dynamic + --force-macos-dynamic-link --build-tools=next targets: generate-libdeps-graph @@ -2626,6 +2627,7 @@ tasks: --dbg=on --opt=on --link-model=dynamic + --force-macos-dynamic-link --visibility-support=on - command: s3.put @@ -2718,6 +2720,7 @@ tasks: task_compile_flags: *embedded_sdk_compile_flags task_compile_flags_extra: >- --link-model=dynamic + --force-macos-dynamic-link # Unlike static builds, dynamic builds have no need to # constrain the number of link jobs. Unfortunately, --jlink=1 # means one link job, not 100%. So this is a bit gross but set |