[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 4/6] build-sys: remove no longer needed ROMS variable
From: |
marcandre . lureau |
Subject: |
[PATCH 4/6] build-sys: remove no longer needed ROMS variable |
Date: |
Sat, 19 Sep 2020 00:47:57 +0400 |
From: Marc-André Lureau <marcandre.lureau@redhat.com>
Signed-off-by: Marc-André Lureau <marcandre.lureau@redhat.com>
---
Makefile | 9 ---------
configure | 3 ---
2 files changed, 12 deletions(-)
diff --git a/Makefile b/Makefile
index 7c60b9dcb8..cb23123606 100644
--- a/Makefile
+++ b/Makefile
@@ -180,16 +180,7 @@ slirp/all: .git-submodule-status
CC="$(CC)" AR="$(AR)" LD="$(LD)" RANLIB="$(RANLIB)" \
CFLAGS="$(QEMU_CFLAGS) $(CFLAGS)" LDFLAGS="$(QEMU_LDFLAGS)")
-ROM_DIRS = $(addprefix pc-bios/, $(ROMS))
-ROM_DIRS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROM_DIRS)))
-# Only keep -O and -g cflags
-.PHONY: $(ROM_DIRS_RULES)
-$(ROM_DIRS_RULES):
- $(call quiet-command,$(MAKE) $(SUBDIR_MAKEFLAGS) -C $(dir $@) V="$(V)"
TARGET_DIR="$(dir $@)" $(notdir $@),)
-
.PHONY: recurse-all recurse-clean
-recurse-all: $(addsuffix /all, $(ROM_DIRS))
-recurse-clean: $(addsuffix /clean, $(ROM_DIRS))
######################################################################
diff --git a/configure b/configure
index 4e56edc70c..fa9b44328b 100755
--- a/configure
+++ b/configure
@@ -6441,8 +6441,6 @@ if test "$guest_agent_msi" = "yes"; then
esac
fi
-roms=
-
# Only build s390-ccw bios if we're on s390x and the compiler has -march=z900
if test "$cpu" = "s390x" ; then
write_c_skeleton
@@ -7397,7 +7395,6 @@ else
QEMU_INCLUDES="-iquote ${source_path}/tcg/${ARCH} $QEMU_INCLUDES"
fi
-echo "ROMS=$roms" >> $config_host_mak
echo "MAKE=$make" >> $config_host_mak
echo "PYTHON=$python" >> $config_host_mak
echo "SPHINX_BUILD=$sphinx_build" >> $config_host_mak
--
2.26.2
- [PATCH 0/6] Convert pc-bios Makefiles to meson, marcandre . lureau, 2020/09/18
- [PATCH 1/6] meson: convert pc-bios/s390-ccw, marcandre . lureau, 2020/09/18
- [PATCH 2/6] optionrom: make kvmapic.S compile with clang, marcandre . lureau, 2020/09/18
- [PATCH 3/6] meson: convert pc-bios/optionrom, marcandre . lureau, 2020/09/18
- [PATCH 4/6] build-sys: remove no longer needed ROMS variable,
marcandre . lureau <=
- [PATCH 5/6] build-sys: remove recurse-* rules, marcandre . lureau, 2020/09/18
- [PATCH 6/6] meson: replace pc-bios/Makefile, marcandre . lureau, 2020/09/18
- Re: [PATCH 0/6] Convert pc-bios Makefiles to meson, no-reply, 2020/09/18
- Re: [PATCH 0/6] Convert pc-bios Makefiles to meson, Paolo Bonzini, 2020/09/19