Skip to content
Closed
Changes from all commits
Commits
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
13 changes: 11 additions & 2 deletions setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
import struct
import subprocess
import sys
import sysconfig
import warnings

from pybind11.setup_helpers import ParallelCompile
Expand Down Expand Up @@ -571,8 +572,16 @@ def build_extensions(self) -> None:
for d in os.environ[k].split(os.path.pathsep):
_add_directory(library_dirs, d)

_add_directory(library_dirs, os.path.join(sys.prefix, "lib"))
_add_directory(include_dirs, os.path.join(sys.prefix, "include"))
_add_directory(
library_dirs,
(sys.prefix == sys.base_prefix and sysconfig.get_config_var("LIBDIR"))
or os.path.join(sys.prefix, "lib"),
Comment on lines +577 to +578

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

At first read, this reads like the pre-Python-2.5 pattern of COND and T or F for T if COND else F, but not quite:

There's a subtle difference here since sysconfig.get_config_var() can return None, so then we fall back to the default. 👍

)
_add_directory(
include_dirs,
(sys.prefix == sys.base_prefix and sysconfig.get_config_var("INCLUDEDIR"))
or os.path.join(sys.prefix, "include"),
)

#
# add platform directories
Expand Down
Loading