gh-107658: Use same logic to look for exec_prefix as for prefix #107661
Conversation
and look for landmark for exec_prefix in library_dir
|
Most changes to Python require a NEWS entry. Please add it using the blurb_it web app or the blurb command-line tool. |
|
All commit authors signed the Contributor License Agreement. |
|
@jpe please may you add a NEWS entry? |
| @@ -0,0 +1 @@ | |||
| Use same logic to look for exec_prefix as for prefix | |||
There was a problem hiding this comment.
Please explain the new logic here.
| if library and not exec_prefix: | ||
| library_dir = dirname(library) | ||
| if PLATSTDLIB_LANDMARK: | ||
| if isdir(joinpath(library_dir, PLATSTDLIB_LANDMARK)): |
There was a problem hiding this comment.
This check could also go at line 605 (pre-change; 611 post-change), where it would be with the rest of the search for exec_prefix.
There was a problem hiding this comment.
My intent was to mimic the blocks that detect prefix -- the block above corresponds to the block for prefix at 553 (the leading comment is nearly identical) and the block for exec_prefix following it corresponds to the block for prefix at 583. I can see how it might be better to rearrange some of the logic and possibly to create a function that's called for each, but the current patch minimizes the number of changes.
There was a problem hiding this comment.
I can see what the intent was, but now it's harder to follow because there are two apparently independent blocks for calculating exec_prefix with no obvious reason. So better to merge it into a single block.
Look for landmark for exec_prefix in library_dir