Skip to content

gh-114099: Refactor configure and Makefile to accomodate non-macOS frameworks #115120

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

Merged
erlend-aasland merged 6 commits into from
Feb 12, 2024
Merged

gh-114099: Refactor configure and Makefile to accomodate non-macOS frameworks #115120

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
28150e7
Refactor configure and Makefile to accomodate non-macOS frameworks.
freakboy3742 Feb 7, 2024
caf24d7
Removed macOS from the list of recognized cross-compile targets.
freakboy3742 Feb 8, 2024
b2bed5a
Corrected the construction of the Framework install name.
freakboy3742 Feb 9, 2024
d714196
Document some edge cases in how PLATFORM_TRIPLET, MULTIARCH and SOABI…
freakboy3742 Feb 9, 2024
00c8965
Merge branch 'main' into iOS-configure-reorg
ned-deily Feb 10, 2024
17f6028
Merge branch 'main' into iOS-configure-reorg
erlend-aasland Feb 11, 2024
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
Corrected the construction of the Framework install name.
  • Loading branch information
@freakboy3742
freakboy3742 committed Feb 9, 2024
commit b2bed5a651b8f77ae8b18ceaeb84ce0543fd01b5
2 changes: 1 addition & 1 deletion Makefile.pre.in
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@ $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)/$(PYTHONFRAMEWORK): \
$(INSTALL) -d -m $(DIRMODE) $(PYTHONFRAMEWORKDIR)/Versions/$(VERSION)
$(CC) -o $(LDLIBRARY) $(PY_CORE_LDFLAGS) -dynamiclib \
-all_load $(LIBRARY) \
-install_name $(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/Versions/$(VERSION)/$(PYTHONFRAMEWORK) \
-install_name $(DESTDIR)$(PYTHONFRAMEWORKINSTALLNAMEPREFIX)/$(PYTHONFRAMEWORK) \
-compatibility_version $(VERSION) \
-current_version $(VERSION) \
-framework CoreFoundation $(LIBS);
Expand Down