meson: use stadard objcopy binary

To start the progress towards using the standard tools and letting users
with special needs use a cross/native file, remove the efi_objcopy
option and use the standard objcopy binary.

Signed-off-by: Ross Burton <ross.burton@arm.com>

diff --git a/efi/meson.build b/efi/meson.build
index ac61aeb85e4f6663e1ce6ea305c3eb32db5a2295..7414bc218325e343272391154673828f09113993 100644 (file)
--- a/efi/meson.build
+++ b/efi/meson.build
@@ -3,7 +3,6 @@ generate_binary = find_program('generate_binary.py', native: true)
 
 efi_cc = get_option('efi-cc')
 efi_ld = get_option('efi-ld')
-efi_objcopy = get_option('efi-objcopy')
 efi_ldsdir = get_option('efi-ldsdir')
 efi_incdir = get_option('efi-includedir')
 
@@ -189,7 +188,7 @@ o_file5 = custom_target('fwup-sbat.o',
                           generate_sbat,
                           '@OUTPUT@',
                           '--cc', efi_cc,
-                          '--objcopy', efi_objcopy,
+                          '--objcopy', objcopy,
                           '--project-name', meson.project_name(),
                           '--project-version', meson.project_version(),
                           '--sbat-version', '1',
@@ -225,7 +224,7 @@ app = custom_target(efi_name,
                       '@INPUT@', '@OUTPUT@',
                       '--arch', gnu_efi_arch,
                       '--os', host_machine.system(),
-                      '--objcopy', efi_objcopy,
+                      '--objcopy', objcopy,
                       '--genpeimg', genpeimg.found() ? genpeimg : ''
                     ],
                     install : true,
@@ -234,7 +233,7 @@ app = custom_target(efi_name,
 dbg = custom_target('efi_debug',
                     input : so,
                     output : efi_name + '.debug',
-                    command : [efi_objcopy,
+                    command : [objcopy,
                                '-j', '.text',
                                '-j', '.sdata',
                                '-j', '.data',

diff --git a/meson.build b/meson.build
index fa5843fa8eeaa914d28ab4e207a7f514ea4882cd..1c2c38f5c7793beb7407cf8908518a610bd1152a 100644 (file)
--- a/meson.build
+++ b/meson.build
@@ -6,6 +6,7 @@ project('fwupd-efi', 'c',
 )
 
 cc = meson.get_compiler('c')
+objcopy = find_program('objcopy')
 
 prefix = get_option('prefix')
 libdir = join_paths(prefix, get_option('libdir'))

diff --git a/meson_options.txt b/meson_options.txt
index d869cd2c96da45df589d571fee556d0aca5ee52a..f10bedc0acadd9f07cf89648aa676ae9ac9e25cd 100644 (file)
--- a/meson_options.txt
+++ b/meson_options.txt
@@ -1,6 +1,5 @@
 option('efi-cc', type : 'string', value : 'gcc', description : 'the compiler to use for EFI modules')
 option('efi-ld', type : 'string', value : 'ld', description : 'the linker to use for EFI modules')
-option('efi-objcopy', type : 'string', value : 'objcopy', description : 'the objcopy utility to use for EFI modules')
 option('efi-libdir', type : 'string', description : 'path to the EFI lib directory')
 option('efi-ldsdir', type : 'string', description : 'path to the EFI lds directory')
 option('efi-includedir', type : 'string', value : '/usr/include/efi', description : 'path to the EFI header directory')