Bug 1529139 - Add proper dependencies for win{32,64}.asm. r=froydnj

Differential Revision: https://phabricator.services.mozilla.com/D20587

--HG--
extra : moz-landing-system : lando
This commit is contained in:
Mike Hommey 2019-02-21 00:11:04 +00:00
Родитель 809c3aaba7
Коммит edeae90ee0
2 изменённых файлов: 11 добавлений и 3 удалений

12
config/external/ffi/moz.build поставляемый
Просмотреть файл

@ -93,7 +93,11 @@ else:
# libffi asm needs to be preprocessed for MSVC # libffi asm needs to be preprocessed for MSVC
GENERATED_FILES += ['win32.asm'] GENERATED_FILES += ['win32.asm']
asm = GENERATED_FILES['win32.asm'] asm = GENERATED_FILES['win32.asm']
asm.inputs = ['/js/src/ctypes/libffi/src/x86/win32.S'] asm.inputs = [
'/js/src/ctypes/libffi/src/x86/win32.S',
'!../../../js/src/ctypes/libffi/fficonfig.h',
'!../../../js/src/ctypes/libffi/include/ffi.h',
]
asm.script = 'preprocess_libffi_asm.py' asm.script = 'preprocess_libffi_asm.py'
asm.flags = ['$(DEFINES)', '$(LOCAL_INCLUDES)'] asm.flags = ['$(DEFINES)', '$(LOCAL_INCLUDES)']
SOURCES += ['!win32.asm'] SOURCES += ['!win32.asm']
@ -106,7 +110,11 @@ else:
# libffi asm needs to be preprocessed for MSVC # libffi asm needs to be preprocessed for MSVC
GENERATED_FILES += ['win64.asm'] GENERATED_FILES += ['win64.asm']
asm = GENERATED_FILES['win64.asm'] asm = GENERATED_FILES['win64.asm']
asm.inputs = ['/js/src/ctypes/libffi/src/x86/win64.S'] asm.inputs = [
'/js/src/ctypes/libffi/src/x86/win64.S',
'!../../../js/src/ctypes/libffi/fficonfig.h',
'!../../../js/src/ctypes/libffi/include/ffi.h',
]
asm.script = 'preprocess_libffi_asm.py' asm.script = 'preprocess_libffi_asm.py'
asm.flags = ['$(DEFINES)', '$(LOCAL_INCLUDES)'] asm.flags = ['$(DEFINES)', '$(LOCAL_INCLUDES)']
SOURCES += ['!win64.asm'] SOURCES += ['!win64.asm']

Просмотреть файл

@ -12,7 +12,7 @@ import shlex
import subprocess import subprocess
def main(output, input_asm, defines, includes): def main(output, input_asm, ffi_h, ffi_config_h, defines, includes):
defines = shlex.split(defines) defines = shlex.split(defines)
includes = shlex.split(includes) includes = shlex.split(includes)
# CPP uses -E which generates #line directives. -EP suppresses them. # CPP uses -E which generates #line directives. -EP suppresses them.