diff options
| author | Helge Konetzka | 2021-09-15 12:56:34 +0200 |
|---|---|---|
| committer | Paolo Bonzini | 2021-11-02 15:57:21 +0100 |
| commit | 984099911275cd4b703e0d9c35b37dd52928acdd (patch) | |
| tree | 07bc777b73b748d934ed5447c5b5679e5881f70a | |
| parent | Partially revert "build: -no-pie is no functional linker flag" (diff) | |
| download | qemu-984099911275cd4b703e0d9c35b37dd52928acdd.tar.gz qemu-984099911275cd4b703e0d9c35b37dd52928acdd.tar.xz qemu-984099911275cd4b703e0d9c35b37dd52928acdd.zip | |
configure/optionrom: Fix MSYS2 multiboot.bin issue
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>
| -rwxr-xr-x | configure | 4 | ||||
| -rw-r--r-- | pc-bios/optionrom/Makefile | 5 |
2 files changed, 6 insertions, 3 deletions
@@ -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 30771f8d17..3482508a86 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 |