]> granicus.if.org Git - python/commitdiff
bpo-30273: update distutils.sysconfig for venv's created from Python (#1515) (#1626)
authorVictor Stinner <victor.stinner@gmail.com>
Wed, 17 May 2017 00:59:24 +0000 (17:59 -0700)
committerGitHub <noreply@github.com>
Wed, 17 May 2017 00:59:24 +0000 (17:59 -0700)
compiled out-of-tree (builddir != srcdir). (see also bpo-15366)
(cherry picked from commit dbdea629e2e0e4bd8845aa55041e0a0ca4172cf3)

Lib/distutils/sysconfig.py

index 4f321352151d56437c9959f00e3702d2e92c1635..bd19ebf5158b09078df2ca4d5b84fd1802224032 100644 (file)
@@ -93,14 +93,11 @@ def get_python_inc(plat_specific=0, prefix=None):
             # the build directory may not be the source directory, we
             # must use "srcdir" from the makefile to find the "Include"
             # directory.
-            base = _sys_home or project_base
             if plat_specific:
-                return base
-            if _sys_home:
-                incdir = os.path.join(_sys_home, 'Include')
+                return _sys_home or project_base
             else:
                 incdir = os.path.join(get_config_var('srcdir'), 'Include')
-            return os.path.normpath(incdir)
+                return os.path.normpath(incdir)
         python_dir = 'python' + get_python_version() + build_flags
         return os.path.join(prefix, "include", python_dir)
     elif os.name == "nt":