[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 2/7] build: include pc-bios/ part in the ROMS variable
From: |
Paolo Bonzini |
Subject: |
[PATCH 2/7] build: include pc-bios/ part in the ROMS variable |
Date: |
Tue, 7 Jun 2022 11:40:26 +0200 |
Include the full path in TARGET_DIR, so that messages from sub-Makefiles
are clearer. Also, prepare for possibly building firmware outside
pc-bios/ from the Makefile,
Signed-off-by: Paolo Bonzini <pbonzini@redhat.com>
---
Makefile | 12 +++++-------
configure | 6 +++---
2 files changed, 8 insertions(+), 10 deletions(-)
diff --git a/Makefile b/Makefile
index 3c0d89057e..ec4445db9a 100644
--- a/Makefile
+++ b/Makefile
@@ -186,16 +186,14 @@ include $(SRC_PATH)/tests/Makefile.include
all: recurse-all
-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):
+ROMS_RULES=$(foreach t, all clean, $(addsuffix /$(t), $(ROMS)))
+.PHONY: $(ROMS_RULES)
+$(ROMS_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))
+recurse-all: $(addsuffix /all, $(ROMS))
+recurse-clean: $(addsuffix /clean, $(ROMS))
######################################################################
diff --git a/configure b/configure
index e69537c756..b1aa97e470 100755
--- a/configure
+++ b/configure
@@ -2242,7 +2242,7 @@ if test -n "$target_cc" &&
fi
done
if test -n "$ld_i386_emulation"; then
- roms="optionrom"
+ roms="pc-bios/optionrom"
config_mak=pc-bios/optionrom/config.mak
echo "# Automatically generated by configure - do not modify" >
$config_mak
echo "TOPSRC_DIR=$source_path" >> $config_mak
@@ -2253,7 +2253,7 @@ fi
probe_target_compilers ppc ppc64
if test -n "$target_cc" && test "$softmmu" = yes; then
- roms="$roms vof"
+ roms="$roms pc-bios/vof"
config_mak=pc-bios/vof/config.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
echo "SRC_DIR=$source_path/pc-bios/vof" >> $config_mak
@@ -2272,7 +2272,7 @@ if test -n "$target_cc" && test "$softmmu" = yes; then
echo "WARNING: Your compiler does not support the z900!"
echo " The s390-ccw bios will only work with guest CPUs >= z10."
fi
- roms="$roms s390-ccw"
+ roms="$roms pc-bios/s390-ccw"
config_mak=pc-bios/s390-ccw/config-host.mak
echo "# Automatically generated by configure - do not modify" > $config_mak
echo "SRC_PATH=$source_path/pc-bios/s390-ccw" >> $config_mak
--
2.36.1
- [PATCH 0/7] More tests/tcg cleanups, Paolo Bonzini, 2022/06/07
- [PATCH 3/7] configure: allow more host/target combos to use the host compiler, Paolo Bonzini, 2022/06/07
- [PATCH 4/7] configure: move tests/tcg/Makefile.prereqs to root build directory, Paolo Bonzini, 2022/06/07
- [PATCH 6/7] tests: simplify Makefile invocation for tests/tcg, Paolo Bonzini, 2022/06/07
- [PATCH 5/7] configure: store container engine in config-host.mak, Paolo Bonzini, 2022/06/07
- [PATCH 2/7] build: include pc-bios/ part in the ROMS variable,
Paolo Bonzini <=
- [PATCH 1/7] meson: put cross compiler info in a separate section, Paolo Bonzini, 2022/06/07
- [PATCH 7/7] tests/tcg: remove -f from Makefile invocation, Paolo Bonzini, 2022/06/07
- Re: [PATCH 0/7] More tests/tcg cleanups, Paolo Bonzini, 2022/06/07