Merge branch 'ColinKinloch-master'

touilleMan · Apr 10, 2018 · 7540875 · 7540875
2 parents e11fde2 + 6a3a40c
commit 7540875
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 8 deletions.
diff --git a/AUTHORS.rst b/AUTHORS.rst
@@ -20,3 +20,4 @@ Contributors
 * Chris Ridenour `@cridenour <https://github.com/cridenour>`_
 * Gary Oberbrunner `@garyo <https://github.com/garyo>`_
 * Paolo Barresi `@paolobb4 <https://github.com/paolobb4>`_
+* Colin Kinloch `@ColinKinloch <https://github.com/ColinKinloch>`_
diff --git a/platforms/osx-64/SCsub b/platforms/osx-64/SCsub
@@ -62,13 +62,19 @@ if env["backend"] == "cpython":
     env.Command(
         cpython_build,
         cpython_src,
-        "cd ${SOURCE} && " + "echo Configuring CPython... && "
-        '1>/dev/null ./configure --enable-shared --prefix=${TARGET.get_abspath()} CPPFLAGS="-I/usr/local/opt/openssl/include" LDFLAGS="-L/usr/local/opt/openssl/lib" && '
-        + "echo Building CPython... && "
-        "1>/dev/null make -j4 && "
-        + "echo Installing CPython in ${TARGET.get_abspath()}... && "
-        "1>/dev/null make install && "
-        + "LD_LIBRARY_PATH=${TARGET.get_abspath()}/lib ${TARGET.get_abspath()}/bin/pip3 install cffi",
+        [
+            "cd ${SOURCE} && " + "echo Configuring CPython... && "
+            '1>/dev/null ./configure --enable-shared --prefix=${TARGET.get_abspath()} CPPFLAGS="-I/usr/local/opt/openssl/include" LDFLAGS="-L/usr/local/opt/openssl/lib" && '
+            + "echo Building CPython... && "
+            "1>/dev/null make -j4 && "
+            + "echo Installing CPython in ${TARGET.get_abspath()}... && "
+            "1>/dev/null make install && "
+            + "LD_LIBRARY_PATH=${TARGET.get_abspath()}/lib ${TARGET.get_abspath()}/bin/pip3 install cffi",
+            Chmod("%s/lib/libpython3.6m.dylib" % cpython_build.abspath, 0o600),
+            "install_name_tool -id @loader_path/lib/libpython3.6m.dylib "
+            + "%s/lib/libpython3.6m.dylib"
+            % cpython_build.abspath,
+        ],
     )
     env.NoClean(cpython_build)
 
@@ -149,7 +155,16 @@ else:  # pypy
         PYPY_SRC_ARCHIVE, None, "curl -L %s -o ${TARGET}" % PYPY_SRC_ARCHIVE_URL
     )
     env.NoClean(PYPY_SRC_ARCHIVE)
-    env.Command(pypy_build, PYPY_SRC_ARCHIVE, "tar xf ${SOURCE} -C ${TARGET.srcdir}")
+    env.Command(
+        pypy_build,
+        PYPY_SRC_ARCHIVE,
+        [
+            "tar xf ${SOURCE} -C ${TARGET.srcdir}",
+            "install_name_tool -id @loader_path/bin/libpypy3-c.dylib "
+            + "%s/bin/libpypy3-c.dylib"
+            % pypy_build.abspath,
+        ],
+    )
 
     def generate_build_dir(target, source, env):
         target = target[0]