diff options
| author | Jason R. Coombs <jaraco@jaraco.com> | 2021-09-21 13:36:09 -0400 |
|---|---|---|
| committer | Jason R. Coombs <jaraco@jaraco.com> | 2021-09-21 13:36:09 -0400 |
| commit | 65e1bb755485cca9ee3b81e3a5125cf12fa2893b (patch) | |
| tree | f40d449a8e16a431b428ebb7e35158fbda287a70 /setuptools/_distutils/command | |
| parent | 0168ac6e13dda1dbc9ec36b30a9c90e3b662a763 (diff) | |
| parent | 02e9f65ab0c88c99a5129ef63c1f92eaf6eca0af (diff) | |
| download | python-setuptools-git-65e1bb755485cca9ee3b81e3a5125cf12fa2893b.tar.gz | |
Merge https://github.com/pypa/distutils into distutils-02e9f65ab0
Diffstat (limited to 'setuptools/_distutils/command')
| -rw-r--r-- | setuptools/_distutils/command/build_ext.py | 2 | ||||
| -rw-r--r-- | setuptools/_distutils/command/install.py | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/setuptools/_distutils/command/build_ext.py b/setuptools/_distutils/command/build_ext.py index f7ab32cf..22628baf 100644 --- a/setuptools/_distutils/command/build_ext.py +++ b/setuptools/_distutils/command/build_ext.py @@ -220,7 +220,7 @@ class build_ext(Command): # For extensions under Cygwin, Python's library directory must be # appended to library_dirs if sys.platform[:6] == 'cygwin': - if sys.executable.startswith(os.path.join(sys.exec_prefix, "bin")): + if not sysconfig.python_build: # building third party extensions self.library_dirs.append(os.path.join(sys.prefix, "lib", "python" + get_python_version(), diff --git a/setuptools/_distutils/command/install.py b/setuptools/_distutils/command/install.py index 400fb45d..866e2d59 100644 --- a/setuptools/_distutils/command/install.py +++ b/setuptools/_distutils/command/install.py @@ -470,6 +470,7 @@ class install(Command): """Sets the install directories by applying the install schemes.""" # it's the caller's problem if they supply a bad name! if (hasattr(sys, 'pypy_version_info') and + sys.version_info < (3, 8) and not name.endswith(('_user', '_home'))): if os.name == 'nt': name = 'pypy_nt' |