Skip to content

Commit dbc6979

Browse files
committed
fix: fix build
Signed-off-by: Paolo Insogna <paolo@cowtech.it>
1 parent a12f461 commit dbc6979

File tree

3 files changed

+9
-4
lines changed

3 files changed

+9
-4
lines changed

deps/libffi/libffi.gyp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -200,7 +200,7 @@
200200
'<(INTERMEDIATE_DIR)/fficonfig.h',
201201
],
202202
'outputs': [
203-
'<(INTERMEDIATE_DIR)/win64_armasm.pre.asm',
203+
'<(INTERMEDIATE_DIR)/win64_armasm.i',
204204
],
205205
'action': [
206206
'<(python)',
@@ -222,7 +222,7 @@
222222
'process_outputs_as_sources': 1,
223223
'inputs': [
224224
'sanitize-asm.py',
225-
'<(INTERMEDIATE_DIR)/win64_armasm.pre.asm',
225+
'<(INTERMEDIATE_DIR)/win64_armasm.i',
226226
],
227227
'outputs': [
228228
'<(INTERMEDIATE_DIR)/win64_armasm.asm',
@@ -231,7 +231,7 @@
231231
'<(python)',
232232
'sanitize-asm.py',
233233
'--input',
234-
'<(INTERMEDIATE_DIR)/win64_armasm.pre.asm',
234+
'<(INTERMEDIATE_DIR)/win64_armasm.i',
235235
'--output',
236236
'<@(_outputs)',
237237
],

deps/libffi/sanitize-asm.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,22 @@
11
#!/usr/bin/env python3
22

33
import argparse
4+
import re
45
from pathlib import Path
56

67

78
def normalize_path(value):
89
return str(value).strip().strip('"')
910

1011

12+
DIRECTIVE_PREFIX = re.compile(r'^\s*\ufeff?#')
13+
14+
1115
def sanitize_asm(input_path, output_path):
1216
source = Path(normalize_path(input_path)).read_text(encoding='utf-8')
1317
lines = []
1418
for line in source.splitlines(keepends=True):
15-
if line.lstrip().startswith('#'):
19+
if DIRECTIVE_PREFIX.match(line):
1620
continue
1721
lines.append(line)
1822

tools/nix/non-v8-deps-mock.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,7 @@ symlinkJoin (finalAttrs: {
5656
configureFlags = [
5757
"--without-lief"
5858
"--without-sqlite"
59+
"--without-ffi"
5960
"--without-ssl"
6061
]
6162
++ (lib.concatMap (sharedLibName: [

0 commit comments

Comments
 (0)