diff options
| author |   Matti Picus <matti.picus@gmail.com> | 2021-03-29 16:40:32 +0300 |
|---|---|---|
| committer | Matti Picus <matti.picus@gmail.com> | 2021-03-29 16:40:32 +0300 |
| commit | 0cc0c764b4c80c7990762f80dc5909a91598a2e7 (patch) | |
| tree | aa98f776e3644204d22b9e31a6a0d539196f1e0f | |
| parent | tweak error formatting (diff) | |
| download | pypy-0cc0c764b4c80c7990762f80dc5909a91598a2e7.tar.gz pypy-0cc0c764b4c80c7990762f80dc5909a91598a2e7.tar.bz2 pypy-0cc0c764b4c80c7990762f80dc5909a91598a2e7.zip | |
try harder to force recompiling openssl when building _ssl import
| -rw-r--r-- | lib_pypy/pypy_tools/build_cffi_imports.py | 1 | ||||
| -rw-r--r-- | pypy/goal/targetpypystandalone.py | 2 | ||||
| -rwxr-xr-x | pypy/tool/release/package.py | 2 |
3 files changed, 3 insertions, 2 deletions
diff --git a/lib_pypy/pypy_tools/build_cffi_imports.py b/lib_pypy/pypy_tools/build_cffi_imports.py index ea5b909029..abb6538c8d 100644 --- a/lib_pypy/pypy_tools/build_cffi_imports.py +++ b/lib_pypy/pypy_tools/build_cffi_imports.py @@ -168,6 +168,7 @@ def _build_dependency(name, patches=[]): def create_cffi_import_libraries(pypy_c, options, basedir, only=None, embed_dependencies=False, rebuild=False): from rpython.tool.runsubprocess import run_subprocess + print('calling create_cffi_import_libraries with "embed_dependencies"', embed_dependencies) shutil.rmtree(str(join(basedir,'lib_pypy','__pycache__')), ignore_errors=True) diff --git a/pypy/goal/targetpypystandalone.py b/pypy/goal/targetpypystandalone.py index 83188c7f42..1669b5f4c6 100644 --- a/pypy/goal/targetpypystandalone.py +++ b/pypy/goal/targetpypystandalone.py @@ -354,7 +354,7 @@ class PyPyTarget(object): ''' Use cffi to compile cffi interfaces to modules''' filename = join(pypydir, '..', 'lib_pypy', 'pypy_tools', 'build_cffi_imports.py') - if sys.platform in ('darwin', 'linux'): + if sys.platform in ('darwin', 'linux', 'linux2'): argv = [filename, '--embed-dependencies'] else: argv = [filename,] diff --git a/pypy/tool/release/package.py b/pypy/tool/release/package.py index 458adf645e..01d2a5c56c 100755 --- a/pypy/tool/release/package.py +++ b/pypy/tool/release/package.py @@ -348,7 +348,7 @@ def package(*args, **kwds): parser.add_argument('--embedded-dependencies', '--no-embedded-dependencies', dest='embed_dependencies', action=NegateAction, - default=(ARCH in ('darwin', 'aarch64')), + default=(ARCH in ('darwin', 'aarch64', 'x86_64')), help='whether to embed dependencies in CFFI modules ' '(default on OS X)') parser.add_argument('--make-portable', |