fix: fix build

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

Author: ShogunPanda

deps/libffi/libffi.gyp

@@ -175,6 +175,7 @@
               'action_name': 'preprocess_win64_arm_asm_with_cl',
               'process_outputs_as_sources': 1,
               'inputs': [
+                'preprocess_asm.py',
                 'include/ffi_cfi.h',
                 'src/aarch64/internal.h',
                 'src/aarch64/win64_armasm.S',
@@ -185,11 +186,20 @@
                 '<(INTERMEDIATE_DIR)/win64_armasm.asm',
               ],
               'action': [
-                'cmd.exe',
-                '/d',
-                '/s',
-                '/c',
-                '"cl.exe /nologo /EP /TC /Iinclude /Isrc\\aarch64 /I<(INTERMEDIATE_DIR) /DFFI_STATIC_BUILD src\\aarch64\\win64_armasm.S > <(INTERMEDIATE_DIR)\\win64_armasm.asm"',
+                '<(python)',
+                'preprocess_asm.py',
+                '--compiler',
+                'cl.exe',
+                '--input',
+                'src/aarch64/win64_armasm.S',
+                '--output',
+                '<@(_outputs)',
+                '--include-dir',
+                'include',
+                '--include-dir',
+                'src/aarch64',
+                '--define',
+                'FFI_STATIC_BUILD',
               ],
             },
           ],

deps/libffi/preprocess_asm.py

@@ -18,7 +18,12 @@ def split_command(value):
     return shlex.split(value, posix=(os.name != 'nt'))
 
 
-def find_compiler():
+def find_compiler(preferred=None):
+    if preferred:
+        command = split_command(preferred)
+        if command and shutil.which(command[0]):
+            return command
+
     for var in ('CC', 'CXX'):
         command = split_command(os.environ.get(var))
         if command and shutil.which(command[0]):
@@ -48,7 +53,7 @@ def unique_paths(paths):
 
 
 def preprocess(args):
-    compiler = find_compiler()
+    compiler = find_compiler(args.compiler)
     input_path = normalize_path(args.input)
     output = Path(normalize_path(args.output))
     include_dirs = [normalize_path(include_dir) for include_dir in args.include_dir]
@@ -74,7 +79,8 @@ def preprocess(args):
 
     processed_lines = []
     for line in result.stdout.splitlines(keepends=True):
-        if line.lstrip().startswith('#'):
+        normalized = line.lstrip('\ufeff\x00 \t\r\n')
+        if normalized.startswith('#'):
             continue
         processed_lines.append(line)
 
@@ -87,6 +93,7 @@ def main(argv=None):
     parser.add_argument('--output', required=True)
     parser.add_argument('--include-dir', action='append', default=[])
     parser.add_argument('--define', action='append', default=[])
+    parser.add_argument('--compiler', default=None)
     args = parser.parse_args(argv)
 
     preprocess(args)