Read about our upcoming Code of Conduct on this issue

Commit a9426e8c authored by Matti Picus's avatar Matti Picus
Browse files

hack the cffi hack to import setuptools on a fresh pypy, gaaaa!

parent 77fff565d382
......@@ -22,6 +22,12 @@ def create_cffi_import_libraries(pypy_c, options, basedir):
shutil.rmtree(str(basedir.join('lib_pypy', '__pycache__')),
ignore_errors=True)
# be sure pip, setuptools are installed in a fresh pypy
# allows proper functioning of cffi on win32 with newer vc compilers
# XXX move this to a build slave step?
status, stdout, stderr = run_subprocess(str(pypy_c), ['-c', 'import setuptools'])
if status != 0:
status, stdout, stderr = run_subprocess(str(pypy_c), ['-m', 'ensurepip'])
failures = []
for key, module in sorted(cffi_build_scripts.items()):
if module is None or getattr(options, 'no_' + key, False):
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment