deps,test: fixed failures

Signed-off-by: Paolo Insogna <paolo@cowtech.it>

Author: ShogunPanda

deps/libffi/libffi.gyp

@@ -55,6 +55,7 @@
         ['target_arch == "x64"', {
           'variables': {
             'libffi_arch_sources': [
+              'src/x86/ffiw64.c',
               'src/x86/ffi64.c',
               'src/x86/unix64.S',
             ],
@@ -83,6 +84,7 @@
         ['target_arch == "x64"', {
           'variables': {
             'libffi_arch_sources': [
+              'src/x86/ffiw64.c',
               'src/x86/ffi64.c',
               'src/x86/unix64.S',
             ],
@@ -137,7 +139,8 @@
           'action': [
             '<(python)',
             'generate-headers.py',
-            '--output-dir=<(INTERMEDIATE_DIR)',
+            '--output-dir',
+            '<(INTERMEDIATE_DIR)',
             '--target-arch',
             '<(target_arch)',
             '--os',

test/ffi/ffi-test-common.js

@@ -27,10 +27,14 @@ function sleep(ms) {
   Atomics.wait(new Int32Array(new SharedArrayBuffer(4)), 0, 0, ms);
 }
 
+function getCompiler(defaultCompiler) {
+  return process.env.CC?.trim() || defaultCompiler;
+}
+
 function getBuildCommand() {
   if (process.platform === 'win32') {
     return {
-      command: process.env.CC || 'cl',
+      command: getCompiler('cl'),
       args: [
         '/nologo',
         '/LD',
@@ -44,7 +48,7 @@ function getBuildCommand() {
 
   if (process.platform === 'darwin') {
     return {
-      command: process.env.CC || 'cc',
+      command: getCompiler('cc'),
       args: [
         '-dynamiclib',
         '-fPIC',
@@ -56,7 +60,7 @@ function getBuildCommand() {
   }
 
   return {
-    command: process.env.CC || 'cc',
+    command: getCompiler('cc'),
     args: [
       '-shared',
       '-fPIC',

test/ffi/test-ffi-permission-allow-cli.js

@@ -1,4 +1,4 @@
-// Flags: --permission --allow-ffi --allow-child-process --experimental-ffi --allow-fs-read=*
+// Flags: --permission --allow-ffi --allow-child-process --experimental-ffi --allow-fs-read=* --allow-fs-write=*
 'use strict';
 
 const { skipIfFFIMissing } = require('../common');