aboutsummaryrefslogtreecommitdiff
path: root/roms
diff options
context:
space:
mode:
authorPhilippe Mathieu-Daudé <philmd@redhat.com>2019-04-09 15:45:36 +0200
committerPaolo Bonzini <pbonzini@redhat.com>2019-04-09 18:33:55 +0200
commit1cab464136b424380dc9a0691147ccf909d5df31 (patch)
treee59c08140f12f150ab3ab4ed81e9d80613f635e1 /roms
parentd912e795e029b6ff76e8b57c7d0254b791907559 (diff)
downloadqemu-1cab464136b424380dc9a0691147ccf909d5df31.zip
qemu-1cab464136b424380dc9a0691147ccf909d5df31.tar.gz
qemu-1cab464136b424380dc9a0691147ccf909d5df31.tar.bz2
roms: Allow passing configure options to the EDK2 build tools
Since commit f590a812c210 we build the EDK2 EfiRom utility unconditionally. Some distributions require to use extra compiler/linker flags, i.e. SUSE which enforces the PIE protection (see [*]). EDK2 build tools already provide a set of variables for that, use them to allow the caller to easily inject compiler/linker options.. Now build scripts can pass extra options, example: $ make -C roms \ EDK2_BASETOOLS_OPTFLAGS='-fPIE' \ efirom [*] https://lists.opensuse.org/opensuse-factory/2017-06/msg00403.html Reported-by: Olaf Hering <olaf@aepfle.de> Suggested-by: Laszlo Ersek <lersek@redhat.com> Signed-off-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190409134536.15548-3-philmd@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Laszlo Ersek <lersek@redhat.com> Reviewed-by: Igor Mammedov <imammedo@redhat.com> Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
Diffstat (limited to 'roms')
-rw-r--r--roms/Makefile15
1 files changed, 14 insertions, 1 deletions
diff --git a/roms/Makefile b/roms/Makefile
index d28252d..1ff78b6 100644
--- a/roms/Makefile
+++ b/roms/Makefile
@@ -120,8 +120,21 @@ build-efi-roms: build-pxe-roms
$(patsubst %,bin-i386-efi/%.efidrv,$(pxerom_targets)) \
$(patsubst %,bin-x86_64-efi/%.efidrv,$(pxerom_targets))
+# Build scripts can pass compiler/linker flags to the EDK2 build tools
+# via the EDK2_BASETOOLS_OPTFLAGS (CPPFLAGS and CFLAGS) and
+# EDK2_BASETOOLS_LDFLAGS (LDFLAGS) environment variables.
+#
+# Example:
+#
+# make -C roms \
+# EDK2_BASETOOLS_OPTFLAGS='...' \
+# EDK2_BASETOOLS_LDFLAGS='...' \
+# efirom
+#
$(EDK2_EFIROM):
- $(MAKE) -C edk2/BaseTools
+ $(MAKE) -C edk2/BaseTools \
+ EXTRA_OPTFLAGS='$(EDK2_BASETOOLS_OPTFLAGS)' \
+ EXTRA_LDFLAGS='$(EDK2_BASETOOLS_LDFLAGS)'
slof:
$(MAKE) -C SLOF CROSS=$(powerpc64_cross_prefix) qemu