aboutsummaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorMarkus Armbruster <armbru@redhat.com>2019-05-28 10:23:05 +0200
committerMarkus Armbruster <armbru@redhat.com>2019-07-02 12:48:40 +0200
commitcdb69b08f984b7cca2acb1989c8eae79390a23f3 (patch)
tree5f2a862aa3c5f1164c83e9dc954ff5731dd8ddb3 /Makefile
parentab200dafc0e8a9925bb0ad0be478621f5f117c95 (diff)
downloadqemu-cdb69b08f984b7cca2acb1989c8eae79390a23f3.zip
qemu-cdb69b08f984b7cca2acb1989c8eae79390a23f3.tar.gz
qemu-cdb69b08f984b7cca2acb1989c8eae79390a23f3.tar.bz2
Makefile: Remove code to smooth transition to config.status
When commit bdf523e6923 made configure generate config.status, it added a fallback to Makefile to smooth the transition, with a TODO "code can be removed after QEMU 1.7." It's been more than five years. Remove it. Signed-off-by: Markus Armbruster <armbru@redhat.com> Reviewed-by: Richard Henderson <richard.henderson@linaro.org> Reviewed-by: Philippe Mathieu-Daudé <philmd@redhat.com> Tested-by: Philippe Mathieu-Daudé <philmd@redhat.com> Message-Id: <20190528082308.22032-2-armbru@redhat.com>
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile9
1 files changed, 1 insertions, 8 deletions
diff --git a/Makefile b/Makefile
index b1c93ac..0f2cb27 100644
--- a/Makefile
+++ b/Makefile
@@ -73,14 +73,7 @@ CONFIG_ALL=y
config-host.mak: $(SRC_PATH)/configure $(SRC_PATH)/pc-bios $(SRC_PATH)/VERSION
@echo $@ is out-of-date, running configure
- @# TODO: The next lines include code which supports a smooth
- @# transition from old configurations without config.status.
- @# This code can be removed after QEMU 1.7.
- @if test -x config.status; then \
- ./config.status; \
- else \
- sed -n "/.*Configured with/s/[^:]*: //p" $@ | sh; \
- fi
+ @./config.status
else
config-host.mak:
ifneq ($(filter-out $(UNCHECKED_GOALS),$(MAKECMDGOALS)),$(if $(MAKECMDGOALS),,fail))