koffi 2.15.1 → 2.15.2-beta.2

package/CHANGELOG.md

@@ -7,6 +7,14 @@
 
 ### Koffi 2.15
 
+#### Koffi 2.15.2
+
+*Released on 2026-03-08*
+
+- Fix build problems on Android/Termux
+- Fix failing indirect loading caused by missing path test
+- Use Clang to build Linux ARM64 prebuild
+
 #### Koffi 2.15.1
 
 *Released on 2025-01-24*

package/index.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// bin/Koffi/package/src/cnoke/src/tools.js
+// ../../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
+  "../../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -345,11 +345,7 @@ var require_tools = __commonJS({
     }
     function unlink_recursive(path3) {
       try {
-        if (fs2.rmSync != null) {
-          fs2.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
-        } else {
-          fs2.rmdirSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
-        }
+        fs2.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
       } catch (err) {
         if (err.code !== "ENOENT")
           throw err;
@@ -397,12 +393,12 @@ var require_tools = __commonJS({
   }
 });
 
-// bin/Koffi/package/src/koffi/package.json
+// ../../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
+  "../../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.15.1",
+      version: "2.15.2-beta.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -434,7 +430,7 @@ var require_package = __commonJS({
       license: "MIT",
       cnoke: {
         api: "../../vendor/node-api-headers",
-        output: "../../bin/Koffi/{{ platform }}_{{ arch }}",
+        output: "../../bin/Koffi/{{ toolchain }}",
         node: 16,
         napi: 8,
         require: "./index.js"
@@ -444,9 +440,9 @@ var require_package = __commonJS({
   }
 });
 
-// bin/Koffi/package/src/koffi/src/init.js
+// ../../../bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
+  "../../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -477,6 +473,7 @@ var require_init = __commonJS({
           triplets.push(musl);
         }
         let filenames = roots.flatMap((root) => triplets.flatMap((triplet3) => [
+          `${root}/koffi/build/koffi/${triplet3}/koffi.node`,
           `${root}/build/koffi/${triplet3}/koffi.node`,
           `${root}/koffi/${triplet3}/koffi.node`,
           `${root}/node_modules/koffi/build/koffi/${triplet3}/koffi.node`,
@@ -529,7 +526,7 @@ var require_init = __commonJS({
   }
 });
 
-// bin/Koffi/package/src/koffi/index.js
+// ../../../bin/Koffi/package/src/koffi/index.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var native2 = null;

package/indirect.js

@@ -4,9 +4,9 @@ var __commonJS = (cb, mod3) => function __require() {
   return mod3 || (0, cb[__getOwnPropNames(cb)[0]])((mod3 = { exports: {} }).exports, mod3), mod3.exports;
 };
 
-// bin/Koffi/package/src/cnoke/src/tools.js
+// ../../../bin/Koffi/package/src/cnoke/src/tools.js
 var require_tools = __commonJS({
-  "bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
+  "../../../bin/Koffi/package/src/cnoke/src/tools.js"(exports2, module2) {
     "use strict";
     var crypto = require("crypto");
     var fs2 = require("fs");
@@ -345,11 +345,7 @@ var require_tools = __commonJS({
     }
     function unlink_recursive(path3) {
       try {
-        if (fs2.rmSync != null) {
-          fs2.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
-        } else {
-          fs2.rmdirSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
-        }
+        fs2.rmSync(path3, { recursive: true, maxRetries: process.platform == "win32" ? 3 : 0 });
       } catch (err) {
         if (err.code !== "ENOENT")
           throw err;
@@ -397,12 +393,12 @@ var require_tools = __commonJS({
   }
 });
 
-// bin/Koffi/package/src/koffi/package.json
+// ../../../bin/Koffi/package/src/koffi/package.json
 var require_package = __commonJS({
-  "bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
+  "../../../bin/Koffi/package/src/koffi/package.json"(exports2, module2) {
     module2.exports = {
       name: "koffi",
-      version: "2.15.1",
+      version: "2.15.2-beta.2",
       description: "Fast and simple C FFI (foreign function interface) for Node.js",
       keywords: [
         "foreign",
@@ -434,7 +430,7 @@ var require_package = __commonJS({
       license: "MIT",
       cnoke: {
         api: "../../vendor/node-api-headers",
-        output: "../../bin/Koffi/{{ platform }}_{{ arch }}",
+        output: "../../bin/Koffi/{{ toolchain }}",
         node: 16,
         napi: 8,
         require: "./index.js"
@@ -444,9 +440,9 @@ var require_package = __commonJS({
   }
 });
 
-// bin/Koffi/package/src/koffi/src/init.js
+// ../../../bin/Koffi/package/src/koffi/src/init.js
 var require_init = __commonJS({
-  "bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
+  "../../../bin/Koffi/package/src/koffi/src/init.js"(exports, module) {
     var fs = require("fs");
     var path = require("path");
     var util = require("util");
@@ -477,6 +473,7 @@ var require_init = __commonJS({
           triplets.push(musl);
         }
         let filenames = roots.flatMap((root) => triplets.flatMap((triplet3) => [
+          `${root}/koffi/build/koffi/${triplet3}/koffi.node`,
           `${root}/build/koffi/${triplet3}/koffi.node`,
           `${root}/koffi/${triplet3}/koffi.node`,
           `${root}/node_modules/koffi/build/koffi/${triplet3}/koffi.node`,
@@ -529,7 +526,7 @@ var require_init = __commonJS({
   }
 });
 
-// bin/Koffi/package/src/koffi/indirect.js
+// ../../../bin/Koffi/package/src/koffi/indirect.js
 var { detect: detect2, init: init2 } = require_init();
 var triplet2 = detect2();
 var mod2 = init2(triplet2, null);

package/package.json

@@ -1,6 +1,6 @@
 {
     "name": "koffi",
-    "version": "2.15.1",
+    "version": "2.15.2-beta.2",
     "description": "Fast and simple C FFI (foreign function interface) for Node.js",
     "keywords": [
         "foreign",
@@ -24,12 +24,12 @@
     "main": "./index.js",
     "types": "./index.d.ts",
     "scripts": {
-        "install": "node src/cnoke/cnoke.js -p . -d src/koffi --prebuild"
+        "install": "node src/cnoke/cnoke.js -P . -D src/koffi --prebuild"
     },
     "license": "MIT",
     "cnoke": {
         "api": "../../vendor/node-api-headers",
-        "output": "build/koffi/{{ platform }}_{{ arch }}",
+        "output": "build/koffi/{{ toolchain }}",
         "node": 16,
         "napi": 8,
         "require": "./index.js"

package/src/cnoke/assets/FindCNoke.cmake

@@ -8,22 +8,6 @@ else()
     set(USE_UNITY_BUILDS OFF CACHE BOOL "Use single-TU builds (aka. Unity builds)")
 endif()
 
-if(NODE_JS_LINK_DEF)
-    set(NODE_JS_LINK_LIB "${CMAKE_CURRENT_BINARY_DIR}/node.lib")
-    if (MSVC)
-        add_custom_command(OUTPUT node.lib
-                           COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
-                                   /def:${NODE_JS_LINK_DEF} /out:${NODE_JS_LINK_LIB}
-                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                           MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
-    else()
-        add_custom_command(OUTPUT node.lib
-                           COMMAND ${CMAKE_DLLTOOL} -d ${NODE_JS_LINK_DEF} -l ${NODE_JS_LINK_LIB}
-                           WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
-                           MAIN_DEPENDENCY ${NODE_JS_LINK_DEF})
-    endif()
-endif()
-
 function(add_node_addon)
     cmake_parse_arguments(ARG "" "NAME" "SOURCES" ${ARGN})
     add_library(${ARG_NAME} SHARED ${ARG_SOURCES} ${NODE_JS_SOURCES})
@@ -45,6 +29,33 @@ function(target_link_node TARGET)
     endif()
 endfunction()
 
+if(WIN32)
+    function(create_import_lib OUTPUT SRC)
+        if (MSVC)
+            add_custom_command(OUTPUT ${OUTPUT}
+                               COMMAND ${CMAKE_AR} ${CMAKE_STATIC_LINKER_FLAGS}
+                                       /def:${SRC} /out:"${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}"
+                               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                               MAIN_DEPENDENCY ${SRC})
+        elseif(DEFINED NODE_JS_DLLTOOL_MACHINE)
+            add_custom_command(OUTPUT ${OUTPUT}
+                               COMMAND ${CMAKE_DLLTOOL} -d ${SRC} -l "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}" -m ${NODE_JS_DLLTOOL_MACHINE}
+                               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                               MAIN_DEPENDENCY ${SRC})
+        else()
+            add_custom_command(OUTPUT ${OUTPUT}
+                               COMMAND ${CMAKE_DLLTOOL} -d ${SRC} -l "${CMAKE_CURRENT_BINARY_DIR}/${OUTPUT}"
+                               WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
+                               MAIN_DEPENDENCY ${SRC})
+        endif()
+    endfunction()
+endif()
+
+if(NODE_JS_LINK_DEF)
+    create_import_lib(node.lib ${NODE_JS_LINK_DEF})
+    set(NODE_JS_LINK_LIB "${CMAKE_CURRENT_BINARY_DIR}/node.lib")
+endif()
+
 if(USE_UNITY_BUILDS)
     function(enable_unity_build TARGET)
         cmake_parse_arguments(ARG "" "" "EXCLUDE" ${ARGN})

package/src/cnoke/assets/toolchains.json

@@ -0,0 +1,126 @@
+{
+    "linux_ia32": {
+        "system": "Linux",
+        "processor": "i386",
+        "triplet": "i686-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_i386"
+    },
+    "linux_x64": {
+        "system": "Linux",
+        "processor": "x86_64",
+        "triplet": "x86_64-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_x64"
+    },
+    "linux_armhf": {
+        "system": "Linux",
+        "processor": "arm",
+        "triplet": "arm-linux-gnueabihf",
+        "sysroot": "../../tools/cross/sysroots/debian_arm32"
+    },
+    "linux_arm64": {
+        "system": "Linux",
+        "processor": "aarch64",
+        "triplet": "aarch64-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_arm64"
+    },
+    "linux_riscv64d": {
+        "system": "Linux",
+        "processor": "riscv64",
+        "triplet": "riscv64-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_riscv64"
+    },
+    "linux_loong64": {
+        "system": "Linux",
+        "processor": "loongarch64",
+        "triplet": "loongarch64-linux-gnu",
+        "sysroot": "../../tools/cross/sysroots/debian_loong64"
+    },
+
+    "win32_ia32": {
+        "system": "Windows",
+        "processor": "X86",
+        "lib": "win-x86",
+        "flags": ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe;/SAFESEH:NO", "-A", "Win32"],
+
+        "triplet": "i386-pc-windows-msvc",
+        "linux": {
+            "sysroot": "../../tools/cross/sysroots/windows_i386",
+            "flags": ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe,/SAFESEH:NO", "-DNODE_JS_DLLTOOL_MACHINE=i386"],
+            "variables": {
+                "CMAKE_DLLTOOL": "llvm-dlltool",
+                "CMAKE_RC_COMPILER": "llvm-rc",
+                "CMAKE_C_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_CXX_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_EXE_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
+                "CMAKE_STATIC_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
+                "CMAKE_SHARED_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp"
+            }
+        }
+    },
+    "win32_x64": {
+        "system": "Windows",
+        "processor": "AMD64",
+        "lib": "win-x64",
+        "flags": ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe"],
+
+        "triplet": "x86_64-pc-windows-msvc",
+        "linux": {
+            "sysroot": "../../tools/cross/sysroots/windows_x64",
+            "flags": ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe", "-DNODE_JS_DLLTOOL_MACHINE=i386:x86-64"],
+            "variables": {
+                "CMAKE_DLLTOOL": "llvm-dlltool",
+                "CMAKE_RC_COMPILER": "llvm-rc",
+                "CMAKE_C_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_CXX_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_EXE_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
+                "CMAKE_STATIC_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp",
+                "CMAKE_SHARED_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/x86_64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/x86_64 -ldelayimp"
+            }
+        }
+    },
+    "win32_arm64": {
+        "system": "Windows",
+        "processor": "ARM64",
+        "lib": "win-arm64",
+        "flags": ["-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe;/SAFESEH:NO", "-A", "ARM64"],
+
+        "triplet": "aarch64-pc-windows-msvc",
+        "linux": {
+            "sysroot": "../../tools/cross/sysroots/windows_arm64",
+            "flags": ["-DNODE_JS_LINK_FLAGS=-Wl,/DELAYLOAD:node.exe,/SAFESEH:NO", "-DNODE_JS_DLLTOOL_MACHINE=arm64"],
+            "variables": {
+                "CMAKE_DLLTOOL": "llvm-dlltool",
+                "CMAKE_RC_COMPILER": "llvm-rc",
+                "CMAKE_C_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_CXX_FLAGS": "-Xmicrosoft-windows-sys-root {{ sysroot }}",
+                "CMAKE_EXE_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp",
+                "CMAKE_STATIC_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp",
+                "CMAKE_SHARED_LINKER_FLAGS": "-Wl,-libpath:{{ sysroot }}/VC/Tools/MSVC/Current/lib/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/ucrt/aarch64,-libpath:{{ sysroot }}/Kits/10/Lib/Current/um/aarch64 -ldelayimp"
+            }
+        }
+    },
+
+    "darwin_x64": {
+        "system": "Darwin",
+        "processor": "x86_64",
+        "flags": ["-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup", "-DCMAKE_OSX_ARCHITECTURES=x86_64"]
+    },
+    "darwin_arm64": {
+        "system": "Darwin",
+        "processor": "arm64",
+        "flags": ["-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup", "-DCMAKE_OSX_ARCHITECTURES=arm64"]
+    },
+
+    "freebsd_x64": {
+        "system": "FreeBSD",
+        "processor": "amd64",
+        "triplet": "x86_64-unknown-freebsd",
+        "sysroot": "../../tools/cross/sysroots/freebsd_x64"
+    },
+    "freebsd_arm64": {
+        "system": "FreeBSD",
+        "processor": "arm64",
+        "triplet": "aarch64-unknown-freebsd",
+        "sysroot": "../../tools/cross/sysroots/freebsd_arm64"
+    }
+}

package/src/cnoke/cnoke.js

@@ -53,41 +53,36 @@ async function main() {
             if (arg == '--help') {
                 print_usage();
                 return;
-            } else if (arg == '-d' || arg == '--directory') {
+            } else if (arg == '-D' || arg == '--directory') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
                 config.project_dir = fs.realpathSync(value);
-            } else if (arg == '-p' || arg == '--package') {
+            } else if (arg == '-P' || arg == '--package') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
                 config.package_dir = fs.realpathSync(value);
-            } else if (arg == '-O' || arg == '--out') {
+            } else if (arg == '-O' || arg == '--output') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
                 config.output_directory = value;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-v' || arg == '--runtime-version')) {
+            } else if ((command == 'build' || command == 'configure') && arg == '--runtime') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
                 if (!value.match(/^[0-9]+\.[0-9]+\.[0-9]+$/))
                     throw new Error(`Malformed runtime version '${value}'`);
 
                 config.runtime_version = value;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-a' || arg == '--arch')) {
-                if (value == null)
-                    throw new Error(`Missing value for ${arg}`);
-
-                config.arch = value;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-t' || arg == '--toolset')) {
+            } else if ((command == 'build' || command == 'configure') && arg == '--clang') {
+                config.prefer_clang = true;
+            } else if ((command == 'build' || command == 'configure') && (arg == '-t' || arg == '--toolchain')) {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
-                config.toolset = value;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-C' || arg == '--prefer-clang')) {
-                config.prefer_clang = true;
-            } else if ((command == 'build' || command == 'configure') && (arg == '-B' || arg == '--config')) {
+                config.toolchain = value;
+            } else if ((command == 'build' || command == 'configure') && (arg == '-c' || arg == '--config')) {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
@@ -100,17 +95,19 @@ async function main() {
                         throw new Error(`Unknown value '${value}' for ${arg}`);
                     } break;
                 }
-            } else if ((command == 'build' || command == 'configure') && (arg == '-D' || arg == '--debug')) {
+            } else if ((command == 'build' || command == 'configure') && arg == '--debug') {
                 config.mode = 'Debug';
-            } else if (command == 'build' && arg == '--verbose') {
-                config.verbose = true;
+            } else if ((command == 'build' || command == 'configure') && arg == '--release') {
+                config.mode = 'Release';
             } else if (command == 'build' && arg == '--prebuild') {
                 config.prebuild = true;
-            } else if (command == 'build' && (arg == '-T' || arg == '--target')) {
+            } else if (command == 'build' && arg == '--target') {
                 if (value == null)
                     throw new Error(`Missing value for ${arg}`);
 
                 config.targets = [value];
+            } else if (command == 'build' && (arg == '-v' || arg == '--verbose')) {
+                config.verbose = true;
             } else {
                 if (arg[0] == '-') {
                     throw new Error(`Unexpected argument '${arg}'`);
@@ -141,30 +138,27 @@ Commands:
 
 Options:
 
-    -d, --directory <DIR>                Change source directory
+    -D, --directory <DIR>                Change source directory
                                          (default: current working directory)
-    -p, --package <DIR>                  Change package directory
+    -P, --package <DIR>                  Change package directory
                                          (default: current working directory)
-
-    -O, --out <DIR>                      Set explicit output directory
+    -O, --output <DIR>                   Set explicit output directory
                                          (default: ./build)
 
-    -B, --config <CONFIG>                Change build type: RelWithDebInfo, Debug, Release
+    -c, --config <CONFIG>                Change build type: RelWithDebInfo, Debug, Release
                                          (default: ${cnoke.DefaultOptions.mode})
-    -D, --debug                          Shortcut for --config Debug
+        --debug                          Shortcut for --config Debug
+        --release                        Shortcut for --config Release
 
-        --prebuild                       Use prebuilt binary if available
-
-    -a, --arch <ARCH>                    Change architecture and ABI
-                                         (default: ${cnoke.determine_arch()})
-    -v, --runtime-version <VERSION>      Change node version
+    -t, --toolchain <TOOLCHAIN>          Cross-compile for specific platform
+        --runtime <VERSION>              Change node version
                                          (default: ${process.version})
-    -t, --toolset <TOOLSET>              Change default CMake toolset
-    -C, --prefer-clang                   Use Clang instead of default CMake compiler
+        --clang                          Use Clang instead of default CMake compiler
 
-    -T, --target <TARGET>                Only build the specified target
+        --prebuild                       Use prebuilt binary if available
+        --target <TARGET>                Only build the specified target
 
-        --verbose                        Show build commands while building
+    -v, --verbose                        Show build commands while building
 
 The ARCH value is similar to process.arch, with the following differences:
 

package/src/cnoke/src/builder.js

@@ -8,6 +8,7 @@ const os = require('os');
 const path = require('path');
 const { spawnSync } = require('child_process');
 const tools = require('./tools.js');
+const TOOLCHAINS = require('../assets/toolchains.json');
 
 const DefaultOptions = {
     mode: 'RelWithDebInfo'
@@ -16,6 +17,8 @@ const DefaultOptions = {
 function Builder(config = {}) {
     let self = this;
 
+    let host = `${process.platform}_${tools.determine_arch()}`;
+
     let app_dir = config.app_dir;
     let project_dir = config.project_dir;
     let package_dir = config.package_dir;
@@ -32,8 +35,7 @@ function Builder(config = {}) {
         package_dir = package_dir.replace(/\\/g, '/');
 
     let runtime_version = config.runtime_version;
-    let arch = config.arch;
-    let toolset = config.toolset || null;
+    let toolchain = config.toolchain || null;
     let prefer_clang = config.prefer_clang || false;
     let mode = config.mode || DefaultOptions.mode;
     let targets = config.targets || [];
@@ -44,8 +46,9 @@ function Builder(config = {}) {
         runtime_version = process.version;
     if (runtime_version.startsWith('v'))
         runtime_version = runtime_version.substr(1);
-    if (arch == null)
-        arch = tools.determine_arch();
+
+    if (toolchain != null && !Object.hasOwn(TOOLCHAINS, toolchain))
+        throw new Error(`Unknown cross-compilation toolchain '${toolchain}'`);
 
     let options = null;
 
@@ -64,7 +67,7 @@ function Builder(config = {}) {
         }
     }
     build_dir = build_dir.replace(/\\/g, '/');
-    work_dir = build_dir + `/v${runtime_version}_${arch}/${mode}`;
+    work_dir = build_dir + `/v${runtime_version}_${toolchain ?? 'native'}/${mode}`;
     output_dir = work_dir + '/Output';
 
     let cmake_bin = null;
@@ -78,7 +81,7 @@ function Builder(config = {}) {
         check_compatibility();
 
         console.log(`>> Node: ${runtime_version}`);
-        console.log(`>> Target: ${process.platform}_${arch}`);
+        console.log(`>> Toolchain: ${toolchain ?? 'native'}`);
 
         // Prepare build directory
         fs.mkdirSync(build_dir, { recursive: true, mode: 0o755 });
@@ -103,77 +106,46 @@ function Builder(config = {}) {
             args.push(`-DNODE_JS_INCLUDE_DIRS=${work_dir}/headers/include/node`);
         } else {
             console.log(`>> Using local node-api headers`);
-            args.push(`-DNODE_JS_INCLUDE_DIRS=${options.api}/include`);
+
+            let api_dir = expand_path(options.api, project_dir);
+            args.push(`-DNODE_JS_INCLUDE_DIRS=${api_dir}/include`);
         }
 
         args.push(`-DCMAKE_MODULE_PATH=${app_dir}/assets`);
 
-        let win32 = (process.platform == 'win32');
-        let msvc = (process.platform == 'win32' && process.env.MSYSTEM == null);
-        let darwin = (process.platform == 'darwin');
+        let win32 = (toolchain ?? host).startsWith('win32_');
+        let mingw = (process.platform == 'win32' && process.env.MSYSTEM != null);
 
         // Handle Node import library on Windows
         if (win32) {
-            if (msvc) {
-                if (options.api == null) {
-                    let dirname;
-                    switch (arch) {
-                        case 'ia32': { dirname = 'win-x86'; } break;
-                        case 'x64': { dirname = 'win-x64'; } break;
-                        case 'arm64': { dirname = 'win-arm64'; } break;
-
-                        default: {
-                            throw new Error(`Unsupported architecture '${arch}' for Node on Windows`);
-                        } break;
-                    }
+            if (mingw) {
+                args.push(`-DNODE_JS_LINK_LIB=node.dll`);
+            } else {
+                let info = TOOLCHAINS[toolchain ?? host];
 
-                    let destname = `${cache_dir}/node_v${runtime_version}_${arch}.lib`;
+                if (options.api == null) {
+                    let destname = `${cache_dir}/node_v${runtime_version}_${toolchain ?? host}.lib`;
 
                     if (!fs.existsSync(destname)) {
                         fs.mkdirSync(cache_dir, { recursive: true, mode: 0o755 });
 
-                        let url = `https://nodejs.org/dist/v${runtime_version}/${dirname}/node.lib`;
+                        let url = `https://nodejs.org/dist/v${runtime_version}/${info.lib}/node.lib`;
                         await tools.download_http(url, destname);
                     }
 
                     fs.copyFileSync(destname, work_dir + '/node.lib');
                     args.push(`-DNODE_JS_LINK_LIB=${work_dir}/node.lib`);
                 } else {
-                    args.push(`-DNODE_JS_LINK_DEF=${options.api}/def/node_api.def`);
-                }
-
-                switch (arch) {
-                    case 'ia32': {
-                        args.push('-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe;/SAFESEH:NO');
-                        args.push('-A', 'Win32');
-                    } break;
-                    case 'arm64': {
-                        args.push('-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe;/SAFESEH:NO');
-                        args.push('-A', 'ARM64');
-                    } break;
-                    case 'x64': {
-                        args.push('-DNODE_JS_LINK_FLAGS=/DELAYLOAD:node.exe');
-                        args.push('-A', 'x64');
-                    } break;
+                    let api_dir = expand_path(options.api, project_dir);
+                    args.push(`-DNODE_JS_LINK_DEF=${api_dir}/def/node_api.def`);
                 }
-
-                fs.copyFileSync(`${app_dir}/assets/win_delay_hook.c`, work_dir + '/win_delay_hook.c');
-                args.push(`-DNODE_JS_SOURCES=${work_dir}/win_delay_hook.c`);
-            } else {
-                args.push(`-DNODE_JS_LINK_LIB=node.dll`);
             }
-        }
-
-        if (darwin) {
-            args.push('-DNODE_JS_LINK_FLAGS=-undefined;dynamic_lookup');
 
-            switch (arch) {
-                case 'arm64': { args.push('-DCMAKE_OSX_ARCHITECTURES=arm64'); } break;
-                case 'x64': { args.push('-DCMAKE_OSX_ARCHITECTURES=x86_64'); } break;
-            }
+            fs.copyFileSync(`${app_dir}/assets/win_delay_hook.c`, work_dir + '/win_delay_hook.c');
+            args.push(`-DNODE_JS_SOURCES=${work_dir}/win_delay_hook.c`);
         }
 
-        if (!msvc) {
+        if (process.platform != 'win32' || mingw) {
             if (spawnSync('ninja', ['--version']).status === 0) {
                 args.push('-G', 'Ninja');
             } else if (process.platform == 'win32') {
@@ -186,16 +158,89 @@ function Builder(config = {}) {
                 args.push('-DCMAKE_CXX_COMPILER_LAUNCHER=ccache');
             }
         }
+
+        // Handle toolchain flags and cross-compilation
+        {
+            let info = TOOLCHAINS[toolchain ?? host];
+
+            if (info != null) {
+                if (Object.hasOwn(info, process.platform))
+                    info = Object.assign({}, info, info[process.platform]);
+
+                if (info.flags != null)
+                    args.push(...info.flags);
+            }
+
+            if (toolchain == null && process.arch == 'ia32') {
+                let proc = spawnSync('uname', ['-m']);
+                let machine = (proc.stdout ?? '').toString('utf-8').trim();
+
+                if (machine == 'x86_64') {
+                    // Compiler probably does not default to 32-bit... just force it
+                    args.push('-DCMAKE_ASM_FLAGS=-m32', '-DCMAKE_C_FLAGS=-m32', '-DCMAKE_CXX_FLAGS=-m32');
+                }
+            }
+
+            if (toolchain != null && info.triplet != null) {
+                let values = [
+                    ['CMAKE_SYSTEM_NAME', info.system],
+                    ['CMAKE_SYSTEM_PROCESSOR', info.processor]
+                ];
+                let sysroot = null;
+
+                // Switch to Clang automatically if the GCC cross-compiler does not exist
+                if (process.platform != 'win32' && !prefer_clang) {
+                    let binary = info.triplet + '-gcc';
+
+                    if (spawnSync(binary, ['-v']).status !== 0)
+                        prefer_clang = true;
+                }
+
+                if (prefer_clang) {
+                    values.push(['CMAKE_ASM_COMPILER_TARGET', info.triplet]);
+                    values.push(['CMAKE_C_COMPILER_TARGET', info.triplet]);
+                    values.push(['CMAKE_CXX_COMPILER_TARGET', info.triplet]);
+
+                    values.push(['CMAKE_EXE_LINKER_FLAGS', '-fuse-ld=lld']);
+                    values.push(['CMAKE_SHARED_LINKER_FLAGS', '-fuse-ld=lld']);
+                    values.push(['CMAKE_STATIC_LINKER_FLAGS', '-fuse-ld=lld']);
+                } else if (process.platform != 'win32') {
+                    values.push(['CMAKE_ASM_COMPILER', info.triplet + '-gcc']);
+                    values.push(['CMAKE_C_COMPILER', info.triplet + '-gcc']);
+                    values.push(['CMAKE_CXX_COMPILER', info.triplet + '-g++']);
+                }
+
+                if (info.sysroot != null) {
+                    sysroot = expand_path(info.sysroot, __dirname + '/..');
+                    if (!fs.existsSync(sysroot))
+                        throw new Error(`Cross-compilation sysroot '${sysroot}' does not exist`);
+
+                    values.push(['CMAKE_SYSROOT', sysroot]);
+                }
+
+                if (info.variables != null) {
+                    for (let key in info.variables) {
+                        let value = expand_string(info.variables[key], { sysroot: sysroot });
+                        values.push([key, value]);
+                    }
+                }
+
+                let filename = `${work_dir}/toolchain.cmake`;
+                let text = values.map(pair => `set(${pair[0]} "${pair[1]}")`).join('\n');
+
+                fs.writeFileSync(filename, text);
+                args.push(`-DCMAKE_TOOLCHAIN_FILE=${filename}`);
+            }
+        }
+
         if (prefer_clang) {
-            if (msvc) {
+            if (process.platform == 'win32' && !mingw) {
                 args.push('-T', 'ClangCL');
             } else {
                 args.push('-DCMAKE_C_COMPILER=clang');
                 args.push('-DCMAKE_CXX_COMPILER=clang++');
             }
         }
-        if (toolset != null)
-            args.push('-T', toolset);
 
         args.push(`-DCMAKE_BUILD_TYPE=${mode}`);
         for (let type of ['ARCHIVE', 'RUNTIME', 'LIBRARY']) {
@@ -231,8 +276,9 @@ function Builder(config = {}) {
             await self.configure();
 
         // In case Make gets used
+        // os.cpus() returns [] on Android (no /proc/cpuinfo access), so fall back to 1
         if (process.env.MAKEFLAGS == null)
-            process.env.MAKEFLAGS = '-j' + os.cpus().length;
+            process.env.MAKEFLAGS = '-j' + (os.cpus().length || 1);
 
         let args = [
             '--build', work_dir,
@@ -423,22 +469,35 @@ function Builder(config = {}) {
         return options;
     }
 
-    function expand_path(str, root_dir) {
+    function expand_string(str, values = {}) {
         let expanded = str.replace(/{{ *([a-zA-Z_][a-zA-Z_0-9]*) *}}/g, (match, p1) => {
             switch (p1) {
                 case 'version': {
                     let options = read_cnoke_options();
                     return options.version || '';
                 } break;
-                case 'platform': return process.platform;
-                case 'arch': return arch;
 
-                default: return match;
+                case 'toolchain': return toolchain ?? host;
+
+                default: {
+                    if (Object.hasOwn(values, p1)) {
+                        return values[p1];
+                    } else {
+                        return match;
+                    }
+                } break;
             }
         });
 
+        return expanded;
+    }
+
+    function expand_path(str, root) {
+        let expanded = expand_string(str);
+
         if (!tools.path_is_absolute(expanded))
-            expanded = path.join(root_dir, expanded);
+            expanded = path.join(root, expanded);
+        expanded = path.normalize(expanded);
 
         return expanded;
     }

package/src/cnoke/src/tools.js

@@ -351,11 +351,7 @@ function decode_elf_header(buf) {
 
 function unlink_recursive(path) {
     try {
-        if (fs.rmSync != null) {
-            fs.rmSync(path, { recursive: true, maxRetries: process.platform == 'win32' ? 3 : 0 });
-        } else {
-            fs.rmdirSync(path, { recursive: true, maxRetries: process.platform == 'win32' ? 3 : 0 });
-        }
+        fs.rmSync(path, { recursive: true, maxRetries: process.platform == 'win32' ? 3 : 0 });
     } catch (err) {
         if (err.code !== 'ENOENT')
             throw err;

package/src/koffi/CMakeLists.txt

@@ -1,7 +1,7 @@
 # SPDX-License-Identifier: MIT
 # SPDX-FileCopyrightText: 2025 Niels Martignène <niels.martignene@protonmail.com>
 
-cmake_minimum_required(VERSION 3.6)
+cmake_minimum_required(VERSION 3.10)
 cmake_policy(SET CMP0091 NEW)
 
 if(NOT NODE_JS_INCLUDE_DIRS)

package/src/koffi/src/init.js

@@ -38,6 +38,7 @@ function init(triplet, native) {
         }
 
         let filenames = roots.flatMap(root => triplets.flatMap(triplet => [
+            `${root}/koffi/build/koffi/${triplet}/koffi.node`,
             `${root}/build/koffi/${triplet}/koffi.node`,
             `${root}/koffi/${triplet}/koffi.node`,
             `${root}/node_modules/koffi/build/koffi/${triplet}/koffi.node`,