aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMatti Picus <matti.picus@gmail.com>2021-10-03 10:03:33 +0300
committerMatti Picus <matti.picus@gmail.com>2021-10-03 10:03:33 +0300
commit609d12609d006333cfe2cb5f5da315b9f3004d36 (patch)
tree3ace332696450c4cba3edbaefd1da864128a053e
parentnpn support is flaky since we default to ssl 1.1.1, this is removed in later ... (diff)
downloadpypy-609d12609d006333cfe2cb5f5da315b9f3004d36.tar.gz
pypy-609d12609d006333cfe2cb5f5da315b9f3004d36.tar.bz2
pypy-609d12609d006333cfe2cb5f5da315b9f3004d36.zip
backport c73cb5fa3e09
-rw-r--r--lib-python/3/venv/__init__.py12
1 files changed, 1 insertions, 11 deletions
diff --git a/lib-python/3/venv/__init__.py b/lib-python/3/venv/__init__.py
index d58a4c1daf..4c1a1f1592 100644
--- a/lib-python/3/venv/__init__.py
+++ b/lib-python/3/venv/__init__.py
@@ -133,7 +133,7 @@ class EnvBuilder:
binname = 'bin'
incpath = 'include'
libpath = os.path.join(env_dir, 'lib',
- 'python%d.%d' % sys.version_info[:2],
+ 'pypy%d.%d' % sys.version_info[:2],
'site-packages')
context.inc_path = path = os.path.join(env_dir, incpath)
create_if_needed(path)
@@ -270,16 +270,6 @@ class EnvBuilder:
copier(src_library, dest_library)
if not os.path.islink(dest_library):
os.chmod(dest_library, 0o755)
- libsrc = os.path.join(context.python_dir, '..', 'lib')
- if os.path.exists(libsrc):
- # PyPy: also copy lib/*.so* for portable builds
- libdst = os.path.join(context.env_dir, 'lib')
- if not os.path.exists(libdst):
- os.mkdir(libdst)
- for f in os.listdir(libsrc):
- src = os.path.join(libsrc, f)
- dst = os.path.join(libdst, f)
- copier(src, dst)
#
else:
if self.symlinks: