From 984099911275cd4b703e0d9c35b37dd52928acdd Mon Sep 17 00:00:00 2001 From: Helge Konetzka Date: Wed, 15 Sep 2021 12:56:34 +0200 Subject: [PATCH] configure/optionrom: Fix MSYS2 multiboot.bin issue This patch enables native builds on MSYS2 with symlinks disabled. Signed-off-by: Helge Konetzka Message-Id: <2b5ab039-8495-b55f-03f1-ecfd996907a9@zapateado.de> Signed-off-by: Paolo Bonzini --- configure | 4 ++++ pc-bios/optionrom/Makefile | 5 ++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/configure b/configure index 07cb7b412a9..03162008aa6 100755 --- a/configure +++ b/configure @@ -3963,6 +3963,10 @@ for rom in seabios; do echo "RANLIB=$ranlib" >> $config_mak 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 cross="config-meson.cross.new" meson_quote() { diff --git a/pc-bios/optionrom/Makefile b/pc-bios/optionrom/Makefile index 30771f8d17c..3482508a863 100644 --- a/pc-bios/optionrom/Makefile +++ b/pc-bios/optionrom/Makefile @@ -1,6 +1,5 @@ -CURRENT_MAKEFILE := $(realpath $(word $(words $(MAKEFILE_LIST)),$(MAKEFILE_LIST))) -SRC_DIR := $(dir $(CURRENT_MAKEFILE)) -TOPSRC_DIR := $(SRC_DIR)/../.. +include config.mak +SRC_DIR := $(TOPSRC_DIR)/pc-bios/optionrom VPATH = $(SRC_DIR) all: multiboot.bin linuxboot.bin linuxboot_dma.bin kvmvapic.bin pvh.bin -- 2.39.5