From 958227890690290ee766aaad1b92f3413f67048c Mon Sep 17 00:00:00 2001 From: Ahmad Fatoum Date: Fri, 26 May 2023 10:11:01 +0200 Subject: [PATCH] mmc-utils: support overriding CFLAGS without setting -DVERSION Build tools like OpenEmbedded set the CFLAGS environment variable to be in line with distro-wide decisions. Updating OpenEmbedded-core to point at the new mmc-utils breaks, because VERSION would then be undefined. Instead of having users workaround this by feeding in -DVERSION from the outside, let's just move it out of environment-overridable CFLAGS and into AM_CFLAGS instead. This will inconvenience users that set their own VERSION a bit: The Makefile sets -Werror and specifying -DVERSION twice will trigger it because of the duplicate definition. This can be resolved by specifying -UVERSION first. Given that the VERSION macro has only been there for a month, this is deemed acceptable. Fixes: 145c74ab6f2e ("mmc-utils: Change version string to git hash") Signed-off-by: Ahmad Fatoum Link: https://lore.kernel.org/r/20230526081100.1741293-1-a.fatoum@pengutronix.de Signed-off-by: Ulf Hansson --- Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index d8d59a4..10b78ab 100644 --- a/Makefile +++ b/Makefile @@ -1,7 +1,8 @@ CC ?= gcc GIT_VERSION := "$(shell git describe --abbrev=6 --always --tags)" -AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 -CFLAGS ?= -g -O2 -DVERSION=\"$(GIT_VERSION)\" +AM_CFLAGS = -D_FILE_OFFSET_BITS=64 -D_FORTIFY_SOURCE=2 \ + -DVERSION=\"$(GIT_VERSION)\" +CFLAGS ?= -g -O2 objects = \ mmc.o \ mmc_cmds.o \