Skip to content

Commit

Permalink
Issue ronaldoussoren#309: Fix incompatibility with macOS 11 in framew…
Browse files Browse the repository at this point in the history
…ork loader
  • Loading branch information
ronaldoussoren committed Jun 24, 2020
1 parent 9b5e8ef commit 29d76ac
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 0 deletions.
2 changes: 2 additions & 0 deletions docs/changelog.rst
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@ An overview of the relevant changes in new, and older, releases.
Version 6.2.2
-------------

* #309: Fix incompatibility with macOS 11 in framework loader

* Another attempt at giving a nice error message when trying to install on
platforms other than macOS.

Expand Down
4 changes: 4 additions & 0 deletions pyobjc-core/Lib/objc/_dyld.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,5 +133,9 @@ def dyld_find(filename):


def pathForFramework(path):
if path.startswith("/System/"):
# On macOS 11 system frameworks are in a shared cache, not
# in the filesystem.
return path
fpath, name, version = infoForFramework(dyld_find(path))
return os.path.join(fpath, name + ".framework")

0 comments on commit 29d76ac

Please sign in to comment.