From cdb69b08f984b7cca2acb1989c8eae79390a23f3 Mon Sep 17 00:00:00 2001 From: Markus Armbruster Date: Tue, 28 May 2019 10:23:05 +0200 Subject: 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 Reviewed-by: Richard Henderson Reviewed-by: Philippe Mathieu-Daudé Tested-by: Philippe Mathieu-Daudé Message-Id: <20190528082308.22032-2-armbru@redhat.com> --- Makefile | 9 +-------- 1 file changed, 1 insertion(+), 8 deletions(-) (limited to 'Makefile') diff --git a/Makefile b/Makefile index b1c93ac027..0f2cb271a2 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)) -- cgit v1.2.3-55-g7522