shaba/systemd-stable
1
1
Fork 0
mirror of https://github.com/systemd/systemd-stable.git synced 2025-01-08 21:17:47 +03:00
Code

meson: use an array option for efi-cc

Browse Source 
Fixes: https://github.com/systemd/systemd/issues/10211
This commit is contained in:
Mike Gilbert 2018-09-30 15:41:41 -04:00
parent f21f31b24b
commit 595343fb4c
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meson_options.txt
View File

@ -278,7 +278,7 @@ option('dbus', type : 'combo', choices : ['auto', 'true', 'false'],
option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'], option('gnu-efi', type : 'combo', choices : ['auto', 'true', 'false'],
description : 'gnu-efi support for sd-boot') description : 'gnu-efi support for sd-boot')
option('efi-cc', type : 'string', option('efi-cc', type : 'array',
description : 'the compiler to use for EFI modules') description : 'the compiler to use for EFI modules')
option('efi-ld', type : 'string', option('efi-ld', type : 'string',
description : 'the linker to use for EFI modules') description : 'the linker to use for EFI modules')

10
src/boot/efi/meson.build
View File

@ -34,8 +34,8 @@ stub_sources = '''
if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false' if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'
efi_cc = get_option('efi-cc') efi_cc = get_option('efi-cc')
if efi_cc == '' if efi_cc.length() == 0
efi_cc = ' '.join(cc.cmd_array()) efi_cc = cc.cmd_array()
endif endif
efi_ld = get_option('efi-ld') efi_ld = get_option('efi-ld')
if efi_ld == '' if efi_ld == ''
@ -57,7 +57,7 @@ if conf.get('ENABLE_EFI') == 1 and get_option('gnu-efi') != 'false'
efi_libdir = get_option('efi-libdir') efi_libdir = get_option('efi-libdir')
if efi_libdir == '' if efi_libdir == ''
cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(efi_cc) cmd = 'cd /usr/lib/$(@0@ -print-multi-os-directory) && pwd'.format(' '.join(efi_cc))
ret = run_command('sh', '-c', cmd) ret = run_command('sh', '-c', cmd)
if ret.returncode() == 0 if ret.returncode() == 0
efi_libdir = ret.stdout().strip() efi_libdir = ret.stdout().strip()
@ -149,7 +149,7 @@ if have_gnu_efi
o_file = custom_target(file + '.o', o_file = custom_target(file + '.o',
input : file, input : file,
output : file + '.o', output : file + '.o',
command : [efi_cc, '-c', '@INPUT@', '-o', '@OUTPUT@'] command : efi_cc + ['-c', '@INPUT@', '-o', '@OUTPUT@']
+ compile_args, + compile_args,
depend_files : efi_headers) depend_files : efi_headers)
if (common_sources + systemd_boot_sources).contains(file) if (common_sources + systemd_boot_sources).contains(file)
@ -160,7 +160,7 @@ if have_gnu_efi
endif endif
endforeach endforeach
libgcc_file_name = run_command(efi_cc, '-print-libgcc-file-name').stdout().strip() libgcc_file_name = run_command(efi_cc + ['-print-libgcc-file-name']).stdout().strip()
systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(EFI_MACHINE_TYPE_NAME) systemd_boot_efi_name = 'systemd-boot@0@.efi'.format(EFI_MACHINE_TYPE_NAME)
stub_efi_name = 'linux@0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME) stub_efi_name = 'linux@0@.efi.stub'.format(EFI_MACHINE_TYPE_NAME)
no_undefined_symbols = find_program('no-undefined-symbols.sh') no_undefined_symbols = find_program('no-undefined-symbols.sh')