-
-
Notifications
You must be signed in to change notification settings - Fork 32k
GH-107585: fix the stable API .lib file name in debug builds on MSVC #107761
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.
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
Open
FFY00
wants to merge
2
commits into
python:main
Choose a base branch
from
FFY00:gh-107585
base: main
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
+12
−4
Open
Changes from all commits
Commits
Show all changes
2 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
2 changes: 2 additions & 0 deletions
2
Misc/NEWS.d/next/Build/2023-08-08-05-48-33.gh-issue-107585.GbieTV.rst
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,2 @@ | ||
Fix the libpython ``.lib`` name when targetting the stable ABI in debug | ||
builds on MSVC. |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -307,13 +307,19 @@ Py_NO_ENABLE_SHARED to find out. Also support MS_NO_COREDLL for b/w compat */ | |
/* So MSVC users need not specify the .lib | ||
file in their Makefile (other compilers are | ||
generally taken care of by distutils.) */ | ||
# if defined(Py_LIMITED_API) | ||
# define PINNED_VER "3" | ||
# else | ||
# define PINNED_VER "313" | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. I'm not sure exactly how the release manager finds these variables to update them, but we might need to update some of their docs/tools for this change. |
||
# endif /* Py_LIMITED_API */ | ||
# if defined(_DEBUG) | ||
# pragma comment(lib,"python313_d.lib") | ||
# elif defined(Py_LIMITED_API) | ||
# pragma comment(lib,"python3.lib") | ||
# define DEBUG_SUFFIX "_d" | ||
# else | ||
# pragma comment(lib,"python313.lib") | ||
# define DEBUG_SUFFIX "" | ||
# endif /* _DEBUG */ | ||
# pragma comment(lib, "python" PINNED_VER DEBUG_SUFFIX ".lib") | ||
# undef PINNED_VER | ||
# undef DEBUG_SUFFIX | ||
# endif /* _MSC_VER */ | ||
# endif /* Py_BUILD_CORE */ | ||
#endif /* MS_COREDLL */ | ||
|
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
_Py_
prefixes on the variables, please.