From 5e5c3f15efe262ff23642dd543faf6a9dbb3bbdb Mon Sep 17 00:00:00 2001 From: Edward O'Callaghan Date: Tue, 24 Nov 2020 23:29:29 +1100 Subject: Makefile: Explicitly set '-std=c99' This matches the build flags that are correctly explicitly defined in meson.build where-as the Makefile is randomly picking up whatever the system toolchain happens to default to. Fix dmi.c while we are here to avoid a re-define of _GNU_SOURCE. BUG=none TEST=`make` with both gcc and clang. Change-Id: I4f973927fc018510a3beaa6c4fa2f356c77c7a6e Signed-off-by: Edward O'Callaghan Reviewed-on: https://review.coreboot.org/c/flashrom/+/47908 Reviewed-by: Stefan Reinauer Reviewed-by: Sam McNally Tested-by: build bot (Jenkins) --- Makefile | 2 +- dmi.c | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/Makefile b/Makefile index 09b21541e..6d37d55b4 100644 --- a/Makefile +++ b/Makefile @@ -30,7 +30,7 @@ INSTALL = install DIFF = diff PREFIX ?= /usr/local MANDIR ?= $(PREFIX)/share/man -CFLAGS ?= -Os -Wall -Wextra -Wno-unused-parameter -Wshadow -Wmissing-prototypes -Wwrite-strings +CFLAGS ?= -std=c99 -D_DEFAULT_SOURCE -D_POSIX_C_SOURCE=200809L -D_BSD_SOURCE -Os -Wall -Wextra -Wno-unused-parameter -Wshadow -Wmissing-prototypes -Wwrite-strings EXPORTDIR ?= . RANLIB ?= ranlib PKG_CONFIG ?= pkg-config diff --git a/dmi.c b/dmi.c index c44221c70..3b717cd23 100644 --- a/dmi.c +++ b/dmi.c @@ -19,7 +19,9 @@ /* strnlen is in POSIX but was a GNU extension up to glibc 2.10 */ #if (__GLIBC__ == 2 && __GLIBC_MINOR__ < 10) || __GLIBC__ < 2 +#ifndef _GNU_SOURCE #define _GNU_SOURCE +#endif /* !GNU_SOURCE */ #else #define _POSIX_C_SOURCE 200809L #endif -- cgit v1.2.3