bpo-35299: Fixed sysconfig and distutils during PGO profiling (GH-11744)
(cherry picked from commit 85e102a2b090dd693d0801ae2edb9660cfa0f281)
Co-authored-by: Steve Dower <steve.dower@microsoft.com>
diff --git a/Lib/distutils/sysconfig.py b/Lib/distutils/sysconfig.py
index e07a6c8..83160f8 100644
--- a/Lib/distutils/sysconfig.py
+++ b/Lib/distutils/sysconfig.py
@@ -29,9 +29,7 @@
project_base = os.path.abspath(os.environ["_PYTHON_PROJECT_BASE"])
else:
project_base = os.path.dirname(os.path.abspath(sys.executable))
-if (os.name == 'nt' and
- project_base.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
- project_base = os.path.dirname(os.path.dirname(project_base))
+
# python_build: (Boolean) if true, we're either building Python or
# building an extension with an un-installed Python, so we use
@@ -43,16 +41,26 @@
if os.path.isfile(os.path.join(d, "Modules", fn)):
return True
return False
+
_sys_home = getattr(sys, '_home', None)
-if (_sys_home and os.name == 'nt' and
- _sys_home.lower().endswith(('\\pcbuild\\win32', '\\pcbuild\\amd64'))):
- _sys_home = os.path.dirname(os.path.dirname(_sys_home))
+
+if os.name == 'nt':
+ def _fix_pcbuild(d):
+ if d and os.path.normcase(d).startswith(
+ os.path.normcase(os.path.join(PREFIX, "PCbuild"))):
+ return PREFIX
+ return d
+ project_base = _fix_pcbuild(project_base)
+ _sys_home = _fix_pcbuild(_sys_home)
+
def _python_build():
if _sys_home:
return _is_python_source_dir(_sys_home)
return _is_python_source_dir(project_base)
+
python_build = _python_build()
+
# Calculate the build qualifier flags if they are defined. Adding the flags
# to the include and lib directories only makes sense for an installation, not
# an in-source build.
@@ -101,6 +109,11 @@
python_dir = 'python' + get_python_version() + build_flags
return os.path.join(prefix, "include", python_dir)
elif os.name == "nt":
+ if python_build:
+ # Include both the include and PC dir to ensure we can find
+ # pyconfig.h
+ return (os.path.join(prefix, "include") + os.path.pathsep +
+ os.path.join(prefix, "PC"))
return os.path.join(prefix, "include")
else:
raise DistutilsPlatformError(