1*4882a593SmuzhiyunChange the efi-cc argument to take an array, so that we can pass compiler flags 2*4882a593Smuzhiyunsuch as --sysroot. 3*4882a593Smuzhiyun 4*4882a593SmuzhiyunIn the long term changing the fwupd-efi build to use the standard Meson 5*4882a593SmuzhiyunCC/LD/etc would be the preferred fix. 6*4882a593Smuzhiyun 7*4882a593SmuzhiyunUpstream-Status: Inappropriate [better fix in progress] 8*4882a593SmuzhiyunSigned-off-by: Ross Burton <ross.burton@arm.com> 9*4882a593Smuzhiyun 10*4882a593Smuzhiyundiff --git a/efi/generate_sbat.py b/efi/generate_sbat.py 11*4882a593Smuzhiyunindex e42b365..4831a48 100755 12*4882a593Smuzhiyun--- a/efi/generate_sbat.py 13*4882a593Smuzhiyun+++ b/efi/generate_sbat.py 14*4882a593Smuzhiyun@@ -7,6 +7,7 @@ 15*4882a593Smuzhiyun # 16*4882a593Smuzhiyun # pylint: disable=missing-docstring, invalid-name 17*4882a593Smuzhiyun 18*4882a593Smuzhiyun+import shlex 19*4882a593Smuzhiyun import subprocess 20*4882a593Smuzhiyun import sys 21*4882a593Smuzhiyun import argparse 22*4882a593Smuzhiyun@@ -19,7 +20,7 @@ def _generate_sbat(args): 23*4882a593Smuzhiyun FWUPD_URL = "https://github.com/fwupd/fwupd-efi" 24*4882a593Smuzhiyun 25*4882a593Smuzhiyun subprocess.run( 26*4882a593Smuzhiyun- [args.cc, "-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True 27*4882a593Smuzhiyun+ shlex.split(args.cc) + ["-x", "c", "-c", "-o", args.outfile, "/dev/null"], check=True 28*4882a593Smuzhiyun ) 29*4882a593Smuzhiyun 30*4882a593Smuzhiyun # not specified 31*4882a593Smuzhiyundiff --git a/efi/meson.build b/efi/meson.build 32*4882a593Smuzhiyunindex 68ea4aa..dcf0d43 100644 33*4882a593Smuzhiyun--- a/efi/meson.build 34*4882a593Smuzhiyun+++ b/efi/meson.build 35*4882a593Smuzhiyun@@ -187,7 +187,7 @@ o_file5 = custom_target('fwup-sbat.o', 36*4882a593Smuzhiyun command : [ 37*4882a593Smuzhiyun generate_sbat, 38*4882a593Smuzhiyun '@OUTPUT@', 39*4882a593Smuzhiyun- '--cc', efi_cc, 40*4882a593Smuzhiyun+ '--cc', ' '.join(efi_cc), 41*4882a593Smuzhiyun '--objcopy', objcopy, 42*4882a593Smuzhiyun '--project-name', meson.project_name(), 43*4882a593Smuzhiyun '--project-version', meson.project_version(), 44*4882a593Smuzhiyundiff --git a/meson_options.txt b/meson_options.txt 45*4882a593Smuzhiyunindex d869cd2..17ef7fb 100644 46*4882a593Smuzhiyun--- a/meson_options.txt 47*4882a593Smuzhiyun+++ b/meson_options.txt 48*4882a593Smuzhiyun@@ -1,4 +1,4 @@ 49*4882a593Smuzhiyun-option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules') 50*4882a593Smuzhiyun+option('efi-cc', type : 'array', value : ['gcc'], description : 'the compiler to use for EFI modules') 51*4882a593Smuzhiyun option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules') 52*4882a593Smuzhiyun option('efi-libdir', type : 'string', description : 'path to the EFI lib directory') 53*4882a593Smuzhiyun option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory') 54