Skip to content

Commit 328f10f

Browse files
committed
fix: fix build
Signed-off-by: Paolo Insogna <paolo@cowtech.it>
1 parent 3ecbf96 commit 328f10f

File tree

2 files changed

+9
-97
lines changed

2 files changed

+9
-97
lines changed

deps/libffi/libffi.gyp

Lines changed: 9 additions & 53 deletions
Original file line numberDiff line numberDiff line change
@@ -140,6 +140,7 @@
140140
'actions': [
141141
{
142142
'action_name': 'preprocess_win64_intel_asm',
143+
'process_outputs_as_sources': 1,
143144
'inputs': [
144145
'preprocess_asm.py',
145146
'include/ffi_cfi.h',
@@ -149,7 +150,7 @@
149150
'<(INTERMEDIATE_DIR)/fficonfig.h',
150151
],
151152
'outputs': [
152-
'<(INTERMEDIATE_DIR)/win64_intel.pre.asm',
153+
'<(INTERMEDIATE_DIR)/win64_intel.asm',
153154
],
154155
'action': [
155156
'<(python)',
@@ -166,74 +167,29 @@
166167
'FFI_STATIC_BUILD',
167168
],
168169
},
169-
{
170-
'action_name': 'sanitize_win64_intel_asm',
171-
'process_outputs_as_sources': 1,
172-
'inputs': [
173-
'sanitize-asm.py',
174-
'<(INTERMEDIATE_DIR)/win64_intel.pre.asm',
175-
],
176-
'outputs': [
177-
'<(INTERMEDIATE_DIR)/win64_intel.asm',
178-
],
179-
'action': [
180-
'<(python)',
181-
'sanitize-asm.py',
182-
'--input',
183-
'<(INTERMEDIATE_DIR)/win64_intel.pre.asm',
184-
'--output',
185-
'<@(_outputs)',
186-
],
187-
},
188170
],
189171
}],
190172
['OS == "win" and target_arch == "arm64"', {
191173
'actions': [
192174
{
193-
'action_name': 'preprocess_win64_arm_asm',
175+
'action_name': 'preprocess_win64_arm_asm_with_cl',
176+
'process_outputs_as_sources': 1,
194177
'inputs': [
195-
'preprocess_asm.py',
196178
'include/ffi_cfi.h',
197179
'src/aarch64/internal.h',
198180
'src/aarch64/win64_armasm.S',
199181
'<(INTERMEDIATE_DIR)/ffi.h',
200182
'<(INTERMEDIATE_DIR)/fficonfig.h',
201183
],
202-
'outputs': [
203-
'<(INTERMEDIATE_DIR)/win64_armasm.i',
204-
],
205-
'action': [
206-
'<(python)',
207-
'preprocess_asm.py',
208-
'--input',
209-
'src/aarch64/win64_armasm.S',
210-
'--output',
211-
'<@(_outputs)',
212-
'--include-dir',
213-
'include',
214-
'--include-dir',
215-
'src/aarch64',
216-
'--define',
217-
'FFI_STATIC_BUILD',
218-
],
219-
},
220-
{
221-
'action_name': 'sanitize_win64_arm_asm',
222-
'process_outputs_as_sources': 1,
223-
'inputs': [
224-
'sanitize-asm.py',
225-
'<(INTERMEDIATE_DIR)/win64_armasm.i',
226-
],
227184
'outputs': [
228185
'<(INTERMEDIATE_DIR)/win64_armasm.asm',
229186
],
230187
'action': [
231-
'<(python)',
232-
'sanitize-asm.py',
233-
'--input',
234-
'<(INTERMEDIATE_DIR)/win64_armasm.i',
235-
'--output',
236-
'<@(_outputs)',
188+
'cmd.exe',
189+
'/d',
190+
'/s',
191+
'/c',
192+
'"cl.exe /nologo /EP /TC /Iinclude /Isrc\\aarch64 /I<(INTERMEDIATE_DIR) /DFFI_STATIC_BUILD src\\aarch64\\win64_armasm.S > <(INTERMEDIATE_DIR)\\win64_armasm.asm"',
237193
],
238194
},
239195
],

deps/libffi/sanitize-asm.py

Lines changed: 0 additions & 44 deletions
This file was deleted.

0 commit comments

Comments
 (0)