From f79618d535084f8c2a41b23279d809e51956972f Mon Sep 17 00:00:00 2001 From: Thomas Heijligen Date: Sat, 19 Feb 2022 17:06:21 +0100 Subject: Makefile: Rework the EXEC_SUFFIX determination Use a conditional function for the statement. This limits the decision to one line instead of multiple places. Change-Id: Iee66dbc609bd5c6eb9d04b457f4508911b2e6560 Signed-off-by: Thomas Heijligen Reviewed-on: https://review.coreboot.org/c/flashrom/+/62195 Tested-by: build bot (Jenkins) Reviewed-by: Angel Pons Reviewed-by: Nico Huber Reviewed-by: Felix Singer --- Makefile | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 3c5ba436..6841552a 100644 --- a/Makefile +++ b/Makefile @@ -242,9 +242,9 @@ HAS_EXTERN_LIBRT := $(call c_link_test, Makefile.d/clock_gettime_test.c, , -l HAS_LINUX_MTD := $(call c_compile_test, Makefile.d/linux_mtd_test.c) HAS_LINUX_SPI := $(call c_compile_test, Makefile.d/linux_spi_test.c) HAS_LINUX_I2C := $(call c_compile_test, Makefile.d/linux_i2c_test.c) +EXEC_SUFFIX := $(strip $(if $(filter $(TARGET_OS), DOS MinGW), .exe)) ifeq ($(TARGET_OS), DOS) -EXEC_SUFFIX := .exe # DJGPP has odd uint*_t definitions which cause lots of format string warnings. override CFLAGS += -Wno-format override LDFLAGS += -lgetopt @@ -260,7 +260,6 @@ endif # FIXME: Should we check for Cygwin/MSVC as well? ifeq ($(TARGET_OS), MinGW) -EXEC_SUFFIX := .exe # MinGW doesn't have the ffs() function, but we can use gcc's __builtin_ffs(). FLASHROM_CFLAGS += -Dffs=__builtin_ffs # Some functions provided by Microsoft do not work as described in C99 specifications. This macro fixes that -- cgit v1.2.3