Skip to content

BPO-41100: macOS branch #21564

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
ronaldoussoren wants to merge 11 commits into from
Closed

BPO-41100: macOS branch #21564

Changes from 1 commit
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
919efcc
Add support for ARM64 to the pythonw tool
ronaldoussoren Jul 20, 2020
69c39f3
Add support for "universal2" as a fat binary target on macOS
ronaldoussoren Jul 20, 2020
3940c86
Tweak ctypes.macholib.dyld to work with the shared library cache.
ronaldoussoren Jul 20, 2020
deda5f0
Silence compile time warning
ronaldoussoren Jul 20, 2020
ea3c200
macOS/arm64 support, based on GH-21249
ronaldoussoren Jul 20, 2020
552bca8
Fix test for macOS before 10.10
ronaldoussoren Jul 20, 2020
e0c23a1
ARM64 is a valid platform for macOS
ronaldoussoren Jul 20, 2020
e637a77
Unconditionally use uint32_t here.
ronaldoussoren Jul 20, 2020
ba2f5a3
Update build-installer.py for universal2 builds
ronaldoussoren Jul 26, 2020
8e3b454
Merge ctypes changes from Apple (PR 21241)
ronaldoussoren Jul 26, 2020
87c942b
The archive-deps.py script isn't really useful
ronaldoussoren Jul 26, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Tweak ctypes.macholib.dyld to work with the shared library cache.
  • Loading branch information
@ronaldoussoren
ronaldoussoren committed Jul 20, 2020
commit 3940c867b6394d8950bfff725133e8a8241081b0
14 changes: 13 additions & 1 deletion Lib/ctypes/macholib/dyld.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,7 +122,19 @@ def dyld_find(name, executable_path=None, env=None):
dyld_executable_path_search(name, executable_path),
dyld_default_search(name, env),
), env):
if os.path.isfile(path):

# on macOS 11 system libraries are in a shared library
# cache, not in the regular place in the filesystem.
# There still are symlinks (libz.dylib -> libz.1.dylib),
# but the target of the symlink no longer is there.
#
# There shouldn't be 3th-party libraries in these
# system locations
if path.startswith("/System/") and os.path.islink(path):
return path
elif path.startswith("/usr/lib/") and os.path.islink(path):
return path
elif os.path.isfile(path):
return path
raise ValueError("dylib %s could not be found" % (name,))

Expand Down