Mercurial > hg-stable
changeset 48228:7bc1beedd718
pyoxidizer: don't use in-memory for resources on macOS
When trying to debug something else on macOS, pyoxidized builds were failing
with the following message about pywatchman (and then cext.base85 when I
commented out pywatchman):
"cannot be loaded from memory but memory loading required"
I don't have any immediate plans to do more work on macOS, but maybe this will
save someone else time debugging this.
Differential Revision: https://phab.mercurial-scm.org/D11451
| author | Matt Harbison <matt_harbison@yahoo.com> |
|---|---|
| date | Fri, 17 Sep 2021 15:02:01 -0400 |
| parents | d8cff8564f5a |
| children | e10f5dc7f5bf |
| files | rust/hgcli/pyoxidizer.bzl |
| diffstat | 1 files changed, 3 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/rust/hgcli/pyoxidizer.bzl Tue Oct 12 14:12:41 2021 -0700 +++ b/rust/hgcli/pyoxidizer.bzl Fri Sep 17 15:02:01 2021 -0400 @@ -33,6 +33,7 @@ TIME_STAMP_SERVER_URL = VARS.get("TIME_STAMP_SERVER_URL", "http://timestamp.digicert.com") IS_WINDOWS = "windows" in BUILD_TARGET_TRIPLE +IS_MACOS = "darwin" in BUILD_TARGET_TRIPLE # Code to run in Python interpreter. RUN_CODE = """ @@ -69,7 +70,7 @@ return default_python_distribution(python_version = "3.9") def resource_callback(policy, resource): - if not IS_WINDOWS: + if not (IS_WINDOWS or IS_MACOS): resource.add_location = "in-memory" return @@ -100,7 +101,7 @@ # extensions. packaging_policy.extension_module_filter = "all" packaging_policy.resources_location = "in-memory" - if IS_WINDOWS: + if IS_WINDOWS or IS_MACOS: packaging_policy.resources_location_fallback = "filesystem-relative:lib" packaging_policy.register_resource_callback(resource_callback)