mirrors/qemu
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

configure/optionrom: Fix MSYS2 multiboot.bin issue

Browse Source 
This patch enables native builds on MSYS2 with symlinks disabled.

Signed-off-by: Helge Konetzka <hk@zapateado.de>
Message-Id: <2b5ab039-8495-b55f-03f1-ecfd996907a9@zapateado.de>
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
This commit is contained in:
Helge Konetzka 2021-09-15 12:56:34 +02:00 committed by Paolo Bonzini
parent ffd205ef29
commit 9840999112
2 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
configure vendored
View File

@ -3963,6 +3963,10 @@ for rom in seabios; do
echo "RANLIB=$ranlib" >> $config_mak echo "RANLIB=$ranlib" >> $config_mak
done done
config_mak=pc-bios/optionrom/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
echo "TOPSRC_DIR=$source_path" >> $config_mak
if test "$skip_meson" = no; then if test "$skip_meson" = no; then
cross="config-meson.cross.new" cross="config-meson.cross.new"
meson_quote() { meson_quote() {

5
pc-bios/optionrom/Makefile
View File

@ -1,6 +1,5 @@
CURRENT_MAKEFILE := $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) include config.mak
SRC_DIR := $(dir $(CURRENT_MAKEFILE)) SRC_DIR := $(TOPSRC_DIR)/pc-bios/optionrom
TOPSRC_DIR := $(SRC_DIR)/../..
VPATH = $(SRC_DIR) VPATH = $(SRC_DIR)
all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin