Skip to content

Fix finding headers when cross compiling #145

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
jaraco merged 7 commits into from
Jun 7, 2022
Merged

Fix finding headers when cross compiling #145

Changes from 1 commit
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
aed7294
Fix finding headers when cross compiling
lopsided98 Sep 25, 2020
b05a823
Avoid re-using 'prefix' variable.
jaraco Jun 7, 2022
4266782
Extract separate functions for _get_python_inc_{os.name}, now that OS…
jaraco Jun 7, 2022
fabd05a
Extract functions for _get_python_inc for config or prefix variants. …
jaraco Jun 7, 2022
bf901de
Merge branch 'main' into python-inc-cross
jaraco Jun 7, 2022
43b424b
⚫ Fade to black.
jaraco Jun 7, 2022
26607e1
Extract function for posix python build.
jaraco Jun 7, 2022
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
15 changes: 14 additions & 1 deletion distutils/sysconfig.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,8 @@ def get_python_inc(plat_specific=0, prefix=None):
If 'prefix' is supplied, use it instead of sys.base_prefix or
sys.base_exec_prefix -- i.e., ignore 'plat_specific'.
"""
if prefix is None:
default_prefix = prefix is None
if default_prefix:
prefix = plat_specific and BASE_EXEC_PREFIX or BASE_PREFIX
if os.name == "posix":
if IS_PYPY and sys.version_info < (3, 8):
Expand All @@ -132,6 +133,18 @@ def get_python_inc(plat_specific=0, prefix=None):
else:
incdir = os.path.join(get_config_var('srcdir'), 'Include')
return os.path.normpath(incdir)
if default_prefix:
# If no prefix was explicitly specified, use the include
# directory from the config vars. This is useful when
# cross-compiling, since the config vars may come the host
Comment thread
jaraco marked this conversation as resolved.
Outdated
# platform Python installation, while the current Python
# executable is from the build platform installation.
if plat_specific:
include_py = get_config_var('CONFINCLUDEPY')
else:
include_py = get_config_var('INCLUDEPY')
if include_py is not None:
return include_py
implementation = 'pypy' if IS_PYPY else 'python'
python_dir = implementation + get_python_version() + build_flags
return os.path.join(prefix, "include", python_dir)
Expand Down