[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PULL 6/9] pc-bios/s390-ccw: Fix the cc-option macro in the Makefile
From: |
Thomas Huth |
Subject: |
[PULL 6/9] pc-bios/s390-ccw: Fix the cc-option macro in the Makefile |
Date: |
Mon, 10 May 2021 09:35:21 +0200 |
The cc-option macro is not doing what it should - compared with the
original from the rules.mak file that got removed with commit
660f793093 ("Makefile: inline the relevant parts of rules.mak"),
the arguments got changed and thus the macro is rather doubling
the QEMU_CFLAGS than adding the flag that should be tested.
Message-Id: <20210502174836.838816-3-thuth@redhat.com>
Fixes: 22fb2ab096 ("pc-bios/s390-ccw: do not use rules.mak")
Signed-off-by: Thomas Huth <thuth@redhat.com>
---
pc-bios/s390-ccw/Makefile | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pc-bios/s390-ccw/Makefile b/pc-bios/s390-ccw/Makefile
index 29fd9019b8..f0fe84c9eb 100644
--- a/pc-bios/s390-ccw/Makefile
+++ b/pc-bios/s390-ccw/Makefile
@@ -6,8 +6,8 @@ include ../../config-host.mak
CFLAGS = -O2 -g
quiet-command = $(if $(V),$1,$(if $(2),@printf " %-7s %s\n" $2 $3 && $1, @$1))
-cc-option = $(if $(shell $(CC) $1 -S -o /dev/null -xc /dev/null > /dev/null \
- 2>&1 && echo OK), $1, $2)
+cc-option = $(if $(shell $(CC) $1 $2 -S -o /dev/null -xc /dev/null \
+ >/dev/null 2>&1 && echo OK),$2,$3)
VPATH_SUFFIXES = %.c %.h %.S %.m %.mak %.sh %.rc Kconfig% %.json.in
set-vpath = $(if $1,$(foreach PATTERN,$(VPATH_SUFFIXES),$(eval vpath
$(PATTERN) $1)))
--
2.27.0
- [PULL 0/9] s390-ccw bios update, Thomas Huth, 2021/05/10
- [PULL 1/9] pc-bios/s390-ccw: don't try to read the next block if end of chunk is reached, Thomas Huth, 2021/05/10
- [PULL 2/9] pc-bios/s390-ccw/bootmap: Silence compiler warning from Clang, Thomas Huth, 2021/05/10
- [PULL 3/9] pc-bios/s390-ccw: Use reset_psw pointer instead of hard-coded null pointer, Thomas Huth, 2021/05/10
- [PULL 5/9] pc-bios/s390-ccw: Silence warning from Clang by marking panic() as noreturn, Thomas Huth, 2021/05/10
- [PULL 4/9] pc-bios/s390-ccw/netboot: Use "-Wl, " prefix to pass parameter to the linker, Thomas Huth, 2021/05/10
- [PULL 7/9] pc-bios/s390-ccw: Silence GCC 11 stringop-overflow warning, Thomas Huth, 2021/05/10
- [PULL 6/9] pc-bios/s390-ccw: Fix the cc-option macro in the Makefile,
Thomas Huth <=
- [PULL 8/9] pc-bios/s390-ccw: Allow building with Clang, too, Thomas Huth, 2021/05/10
- Re: [PULL 8/9] pc-bios/s390-ccw: Allow building with Clang, too, Philippe Mathieu-Daudé, 2021/05/12
[PULL 9/9] pc-bios/s390: Update the s390-ccw bios binaries with the Clang and other fixes, Thomas Huth, 2021/05/10
Re: [PULL 0/9] s390-ccw bios update, Peter Maydell, 2021/05/12