Implement M1 build.

Author: Maxwell175

Lib/__np__/common.py

@@ -215,6 +215,7 @@ def run_with_output(*args, **kwargs):
     import subprocess
 
     stdin = kwargs.pop("stdin", None)
+    quiet = kwargs.pop("quiet", False)
     assert not kwargs
 
     p = subprocess.Popen(
@@ -227,8 +228,9 @@ def run_with_output(*args, **kwargs):
 
     output = ""
     for line in p.stdout:
-        sys.stdout.write(line)
-        sys.stdout.flush()
+        if not quiet:
+            sys.stdout.write(line)
+            sys.stdout.flush()
         output += line
     p.wait()
     if p.returncode != 0:

Lib/rebuildpython.py

@@ -428,7 +428,7 @@ def run_rebuild():
         sysconfig_libs = []
         sysconfig_lib_dirs = []
         for arg in (
-                ["-lm", "-pthread", "-lutil", "-ldl"]
+                ["-lm", "-pthread", "-lutil", "-ldl", "-lffi"]
                 + sysconfig.get_config_var("LDFLAGS").split()
                 + sysconfig.get_config_var("CFLAGS").split()
         ):
@@ -456,10 +456,14 @@ def run_rebuild():
         extra_args_combined = [x for x in sysconfig.get_config_var("LDFLAGS").split() if not x.startswith("-L") and not x.startswith("-l")] \
                                 + extra_link_args \
                                 + [
-                                    "-flto",
+                                    "-flto=thin",
                                     "-framework", "SystemConfiguration",
                                     "-framework", "CoreFoundation",
+                                    "-framework", "Carbon",
                                 ]
+        num_link_threads = os.environ.get("LINK_THREADS", None)
+        if num_link_threads is not None:
+            extra_args_combined += ["-Wl,-mllvm,-threads=" + num_link_threads]
         i = 0
         used_frameworks = []
         final_extra_link_args = ["-lstdc++"]
@@ -470,7 +474,7 @@ def run_rebuild():
                     used_frameworks.append(extra_args_combined[i + 1])
                     final_extra_link_args += ["-framework", extra_args_combined[i + 1]]
                 i += 2
-            if extra_args_combined[i].lower() in ("-g", "-xlinker"):
+            elif extra_args_combined[i].lower() in ("-g", "-xlinker"):
                 i += 1
             else:
                 final_extra_link_args += [extra_args_combined[i]]
@@ -486,7 +490,7 @@ def run_rebuild():
             extra_midargs=final_extra_link_args,
         )
 
-        otool_output = __np__.run_with_output("otool", "-l", os.path.join(build_dir, "python"))
+        otool_output = __np__.run_with_output("otool", "-l", os.path.join(build_dir, "python"), quiet=True)
         curr_load_lines = []
         for line in otool_output.split('\n'):
             if line.startswith("Load command") or line.startswith("Section"):

Modules/Setup.macos

@@ -263,7 +263,7 @@ _sha3 _sha3/sha3module.c
 _blake2 _blake2/blake2module.c _blake2/blake2b_impl.c _blake2/blake2s_impl.c
 
 # Nuitka: _ctypes module
-_ctypes -I$(srcdir)/Modules/_ctypes _ctypes/malloc_closure.c _ctypes/stgdict.c _ctypes/callbacks.c _ctypes/cfield.c _ctypes/_ctypes.c _ctypes/callproc.c
+_ctypes -I$(srcdir)/Modules/_ctypes -I$(srcdir)/Modules/_ctypes/darwin _ctypes/malloc_closure.c _ctypes/stgdict.c _ctypes/callbacks.c _ctypes/cfield.c _ctypes/_ctypes.c _ctypes/callproc.c -lffi -DUSING_MALLOC_CLOSURE_DOT_C=1 -DMACOSX -DUSING_APPLE_OS_LIBFFI=1 -DHAVE_FFI_PREP_CIF_VAR=1 -DHAVE_FFI_PREP_CLOSURE_LOC=1 -DHAVE_FFI_CLOSURE_ALLOC=1
 #_ctypes/darwin/dlfcn_simple.c
 #_ctypes/libffi_osx/types.c
 #_ctypes/libffi_osx/powerpc/ppc-ffi_darwin.c

build.mac.sh

@@ -3,12 +3,22 @@
 set -e
 set -x
 
+if [ "$arch" = "" ]; then
+  if [ "$(arch)" = "arm64" ]; then
+    arch=arm64
+  else
+    arch=x86-64
+  fi
+fi
+
+echo Building for architecture $arch
+
 # The dependencies must be outside of the build folder because
 # the python build process ends up running a find -delete that
 # happens to also delete all the static libraries that we built.
 export "PREFIX=$(pwd)/../Nuitka-Python-Deps"
-export "CFLAGS=-mmacosx-version-min=10.9 -I${PREFIX}/include"
-export "LDFLAGS=-L${PREFIX}/lib"
+export "CFLAGS=-arch $arch -mmacosx-version-min=10.9 -I${PREFIX}/include -I$(xcode-select -p)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX.sdk/usr/include/ffi -flto=thin"
+export "LDFLAGS=-arch $arch -L${PREFIX}/lib"
 export "MACOSX_DEPLOYMENT_TARGET=10.9"
 
 
@@ -49,7 +59,11 @@ if [ ! -d openssl-1.1.1q ]; then
 curl https://www.openssl.org/source/openssl-1.1.1q.tar.gz -o openssl.tar.gz
 tar -xf openssl.tar.gz
 cd openssl-1.1.1q
-./configure --prefix=${PREFIX} darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 no-shared no-tests
+if [ "$arch" = "arm64" ]; then
+  ./Configure --prefix=${PREFIX} darwin64-arm64-cc enable-ec_nistp_64_gcc_128 no-shared no-tests
+else
+  ./Configure --prefix=${PREFIX} darwin64-x86_64-cc enable-ec_nistp_64_gcc_128 no-shared no-tests
+fi
 make depend all -j$(sysctl -n hw.ncpu)
 make install 
 cd ..
@@ -93,16 +107,6 @@ make install
 cd ..
 fi
 
-if [ ! -d libffi-3.4.2 ]; then
-curl -L https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz -o libffi.tar.gz
-tar -xf libffi.tar.gz
-cd libffi-3.4.2
-./configure --prefix=${PREFIX} --disable-shared
-make -j$(sysctl -n hw.ncpu)
-make install
-cd ..
-fi
-
 if [ ! -d zlib-1.2.12 ]; then
 curl -L https://zlib.net/zlib-1.2.12.tar.gz -o zlib.tar.gz
 tar -xf zlib.tar.gz
@@ -169,17 +173,19 @@ fi
 
 cp Modules/Setup.macos Modules/Setup
 
+export "LDFLAGS=-L${PREFIX}/lib"
+
 # The UCS4 has best compatibility with wheels on PyPI it seems.
 ./configure "--prefix=$target" --disable-shared --enable-ipv6 --enable-unicode=ucs4 \
   --enable-optimizations --with-lto --with-computed-gotos --with-fpectl \
   CC="$CC" \
   CXX="$CXX" \
   CFLAGS="-g -mmacosx-version-min=10.9 $CFLAGS" \
-  LDFLAGS="-g -Xlinker $LDFLAGS" \
-  LIBS="-lffi -lbz2 -luuid -lsqlite3 -llzma"
+  LDFLAGS="-arch $arch -g -Xlinker $LDFLAGS" \
+  LIBS="-lffi -lbz2 -luuid -lsqlite3 -llzma" \
+  ax_cv_c_float_words_bigendian=no
 
 make -j 32 \
-        EXTRA_CFLAGS="-flto" \
         PROFILE_TASK='./Lib/test/regrtest.py -j 8 -x test_bsddb3 test_compiler test_cpickle test_cprofile test_dbm_dumb test_dbm_ndbm test_distutils test_ensurepip test_gdb test_io test_linuxaudiodev test_multiprocessing test_ossaudiodev test_platform test_pydoc test_socketserver test_subprocess test_sundry test_thread test_threaded_import test_threadedtempfile test_threading test_threading_local test_threadsignals test_xmlrpc test_zipfile' \
         profile-opt
 

build.sh

@@ -109,7 +109,7 @@ cd ..
 fi
 
 if [ ! -d libffi-3.4.2 ]; then
-curl -L https://github.com/libffi/libffi/releases/download/v3.4.2/libffi-3.4.2.tar.gz -o libffi.tar.gz
+curl -L https://github.com/libffi/libffi/releases/download/v3.4.3/libffi-3.4.3.tar.gz -o libffi.tar.gz
 tar -xf libffi.tar.gz
 cd libffi-3.4.2
 ./configure --prefix=${PREFIX} --disable-shared