[pypy-commit] pypy default: hack the cffi hack to import setuptools on a fresh pypy, gaaaa!

[mattip]

Author: Matti Picus <matti.picus at gmail.com>
Branch: 
Changeset: r92900:a2348b760a36
Date: 2017-11-02 09:52 +0200
http://bitbucket.org/pypy/pypy/changeset/a2348b760a36/

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

diff --git a/pypy/tool/build_cffi_imports.py b/pypy/tool/build_cffi_imports.py
--- a/pypy/tool/build_cffi_imports.py
+++ b/pypy/tool/build_cffi_imports.py
@@ -22,6 +22,12 @@
 
     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):