diff options
| author | Stefan Tauner <stefan.tauner@gmx.at> | 2017-10-26 18:45:00 +0200 |
|---|---|---|
| committer | Nico Huber <nico.h@gmx.de> | 2017-11-04 16:07:47 +0000 |
| commit | 22ce83ed99fb28965d265d558c3e28993bfa5fa6 (patch) | |
| tree | 93541e649bda8ee48c67a007c95a7a830dae8bf9 | |
| parent | 3a235498b460c708c0aee07a93fbcc68e43302ca (diff) | |
| download | flashrom-22ce83ed99fb28965d265d558c3e28993bfa5fa6.tar.gz flashrom-22ce83ed99fb28965d265d558c3e28993bfa5fa6.tar.bz2 flashrom-22ce83ed99fb28965d265d558c3e28993bfa5fa6.zip | |
Fix standalone ich_descriptor_tool compilation with MinGW and DJGPP
TARGET_OS as well as EXEC_SUFFIX were only set when called via the
main makefile and even then __USE_MINGW_ANSI_STDIO was not set
for MinGW.
While at it, also replace the hardcoded gnu_printf printf format
attribute with __MINGW_PRINTF_FORMAT which is set according to
__USE_MINGW_ANSI_STDIO respectively.
Change-Id: Id146f5ba06a0e510397c6f32a2bd7c819a405a25
Signed-off-by: Stefan Tauner <stefan.tauner@gmx.at>
Reviewed-on: https://review.coreboot.org/21838
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Nico Huber <nico.h@gmx.de>
Reviewed-on: https://review.coreboot.org/22336
| -rw-r--r-- | flash.h | 2 | ||||
| -rw-r--r-- | util/ich_descriptors_tool/Makefile | 13 |
2 files changed, 14 insertions, 1 deletions
@@ -324,7 +324,7 @@ int flashrom_print_cb(enum flashrom_log_level level, const char *fmt, va_list ap /* Let gcc and clang check for correct printf-style format strings. */ int print(enum flashrom_log_level level, const char *fmt, ...) #ifdef __MINGW32__ -__attribute__((format(gnu_printf, 2, 3))); +__attribute__((format(__MINGW_PRINTF_FORMAT, 2, 3))); #else __attribute__((format(printf, 2, 3))); #endif diff --git a/util/ich_descriptors_tool/Makefile b/util/ich_descriptors_tool/Makefile index e312996f9..d1b5eae92 100644 --- a/util/ich_descriptors_tool/Makefile +++ b/util/ich_descriptors_tool/Makefile @@ -21,10 +21,23 @@ CC ?= gcc # If the user has specified custom CFLAGS, all CFLAGS settings below will be # completely ignored by gnumake. CFLAGS ?= -Os -Wall -Wshadow + +override TARGET_OS := $(shell $(CC) $(CPPFLAGS) -E $(SHAREDSRCDIR)/os.h | grep -v '^\#' | grep '"' | \ + cut -f 2 -d'"') + ifeq ($(TARGET_OS), DOS) +EXEC_SUFFIX := .exe # DJGPP has odd uint*_t definitions which cause lots of format string warnings. CFLAGS += -Wno-format endif + +ifeq ($(TARGET_OS), MinGW) +EXEC_SUFFIX := .exe +# Some functions provided by Microsoft do not work as described in C99 specifications. This macro fixes that +# for MinGW. See http://sourceforge.net/p/mingw-w64/wiki2/printf%20and%20scanf%20family/ */ +FLASHROM_CFLAGS += -D__USE_MINGW_ANSI_STDIO=1 +endif + ifeq ($(WARNERROR), yes) CFLAGS += -Werror endif |