Installing FFI

Author: Shillaker

tasks/cpython.py

@@ -87,6 +87,7 @@ def build(ctx, clean=False, noconf=False, nobuild=False):
             "--disable-ipv6",
             "--disable-shared",
             "--prefix={}".format(INSTALL_DIR),
+            "--with-system-ffi",
         ]
     )
 

tasks/ffi.py

@@ -13,6 +13,7 @@
 from tasks.env import THIRD_PARTY_DIR, USABLE_CPUS, PROJ_ROOT
 
 LIBFFI_DIR = join(THIRD_PARTY_DIR, "libffi")
+LIBFFI_INSTALL_DIR = join(LIBFFI_DIR, "wasm32-unknown-wasi")
 
 
 @task(default=True)
@@ -46,12 +47,19 @@ def build(ctx, clean=False):
     run("make install", shell=True, check=True, cwd=LIBFFI_DIR)
 
     # Ensure the lib is copied into place
-    src_lib = join(LIBFFI_DIR, "wasm32-unknown-wasi", ".libs", "libffi.a")
+    src_lib = join(LIBFFI_INSTALL_DIR, ".libs", "libffi.a")
     dest_lib = join(WASM_LIB_INSTALL, "libffi.a")
     print("Copying {} to {}".format(src_lib, dest_lib))
     run("cp {} {}".format(src_lib, dest_lib), shell=True, check=True)
 
+    # Copy header files
+    header_src = join(LIBFFI_INSTALL_DIR, "include", "*")
+    header_dest = join(WASM_SYSROOT, "include")
+    print("Copying {} to {}".format(header_src, header_dest))
+    run("cp {} {}".format(header_src, header_dest), shell=True, check=True)
+
     # Copy imports into place
     src_imports = join(PROJ_ROOT, "libffi.imports")
     dest_imports = join(WASM_LIB_INSTALL, "libffi.imports")
+    print("Copying {} to {}".format(src_imports, dest_imports))
     run("cp {} {}".format(src_imports, dest_imports), check=True, shell=True)