diff mbox

Unbreak FreeBSD build after optionrom update.

Message ID 20160726210533.20116-1-sbruno@freebsd.org (mailing list archive)
State New, archived
Headers show

Commit Message

Sean Bruno July 26, 2016, 9:05 p.m. UTC 
Update the build flags appropriately for FreeBSD and add the
correct LD_EMULATION type for the FreeBSD build case.

Fixes FreeBSD build error:
	ld: unrecognised emulation mode: elf_i386
	Supported emulations: elf_x86_64_fbsd elf_i386_fbsd
	gmake[1]: *** [Makefile:51: linuxboot_dma.img] Error 1
	gmake: *** [Makefile:229: romsubdir-optionrom] Error 2

Signed-off-by: Sean Bruno <sbruno@freebsd.org>
---
 pc-bios/optionrom/Makefile | 4 ++++
 1 file changed, 4 insertions(+)

Comments

Peter Maydell July 29, 2016, 1:53 p.m. UTC | #1 
On 26 July 2016 at 22:05, Sean Bruno <sbruno@freebsd.org> wrote:
> Update the build flags appropriately for FreeBSD and add the
> correct LD_EMULATION type for the FreeBSD build case.
>
> Fixes FreeBSD build error:
>         ld: unrecognised emulation mode: elf_i386
>         Supported emulations: elf_x86_64_fbsd elf_i386_fbsd
>         gmake[1]: *** [Makefile:51: linuxboot_dma.img] Error 1
>         gmake: *** [Makefile:229: romsubdir-optionrom] Error 2
>
> Signed-off-by: Sean Bruno <sbruno@freebsd.org>
> ---

Applied, thanks.

-- PMM
diff mbox

Patch

diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile
index d88ce11..8c8d7cd 100644
--- a/pc-bios/optionrom/Makefile
+++ b/pc-bios/optionrom/Makefile
@@ -44,8 +44,12 @@  build-all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin
 ifdef CONFIG_WIN32
 LD_EMULATION = i386pe
 else
+ifdef CONFIG_BSD
+LD_EMULATION = elf_i386_fbsd
+else
 LD_EMULATION = elf_i386
 endif
+endif
 
 %.img: %.o
 	$(call quiet-command,$(LD) $(LDFLAGS_NOPIE) -m $(LD_EMULATION) -Ttext 0 -e _start -s -o $@ $<,"  Building $(TARGET_DIR)$@")