Merge commit '0a34c' into refcounting

287a69e4 · Kevin Modzelewski · e7a6c890 · 0a34c2af · 40eb32aa · 287a69e4
Commit 287a69e4 authored Feb 26, 2016 by Kevin Modzelewski
Hide whitespace changes
Inline Side-by-side

Showing with 14 additions and 7 deletions

build_deps/libpypa build_deps/libpypa +1 -1

from_cpython/Lib/sysconfig.py from_cpython/Lib/sysconfig.py +13 -6

No files found.
--- a/libpypa @ 40eb32aa
+++ b/libpypa @ 40eb32aa
-Subproject commit 728c4bc8c99d09da224ff3a2be82c98a1b026e82
+Subproject commit 40eb32aa846b21e122cfa1f10bf8972e67de14c8
--- a/from_cpython/Lib/sysconfig.py
+++ b/from_cpython/Lib/sysconfig.py
@@ -7,12 +7,19 @@ from os.path import pardir, realpath

 _INSTALL_SCHEMES = {
    'posix_prefix': {
-        'stdlib': '{base}/lib/python{py_version_short}',
-        'platstdlib': '{platbase}/lib/python{py_version_short}',
-        'purelib': '{base}/lib/python{py_version_short}/site-packages',
-        'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
-        'include': '{base}/include/python{py_version_short}',
-        'platinclude': '{platbase}/include/python{py_version_short}',
+        # Pyston changes: changed paths
+        # 'stdlib': '{base}/lib/python{py_version_short}',
+        # 'platstdlib': '{platbase}/lib/python{py_version_short}',
+        # 'purelib': '{base}/lib/python{py_version_short}/site-packages',
+        # 'platlib': '{platbase}/lib/python{py_version_short}/site-packages',
+        # 'include': '{base}/include/python{py_version_short}',
+        # 'platinclude': '{platbase}/include/python{py_version_short}',
+        'stdlib': '{base}/from_cpython/Lib',
+        'platstdlib': '{platbase}/from_cpython/Lib',
+        'purelib': '{base}/site-packages',
+        'platlib': '{platbase}/site-packages',
+        'include': '{base}/from_cpython/Include',
+        'platinclude': '{platbase}/from_cpython/Include',
        'scripts': '{base}/bin',
        'data': '{base}',
        },