From: Marcin Juszkiewicz <marcin@juszkiewicz.com.pl>
Date: Mon, 10 Feb 2020 15:21:52 +0000 (+0100)
Subject: Add missing CPPFLAGS and LDFLAGS
X-Git-Tag: archive/raspbian/0_R99-14469.B-2+rpi1^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=2b3c390203d416d4846c77eef65ae3129287d439;p=vboot-utils.git

Add missing CPPFLAGS and LDFLAGS

Origin: Debian
Last-Update: 2020-10-27

Gbp-Pq: Name 0006-add-CPPFLAGS-LDFLAGS.patch
---

diff --git a/Makefile b/Makefile
index 218437f..acb379d 100644
--- a/Makefile
+++ b/Makefile
@@ -142,6 +142,7 @@ COMMON_FLAGS := -pipe ${WERROR} -Wall -Wstrict-prototypes -Wtype-limits \
 
 # FIRMWARE_ARCH is defined if compiling for a firmware target
 # (coreboot or depthcharge).
+CFLAGS += $(CPPFLAGS)
 ifeq (${FIRMWARE_ARCH},arm)
 CC ?= armv7a-cros-linux-gnueabihf-gcc
 CFLAGS ?= -march=armv5 -fno-common -ffixed-r8 -mfloat-abi=hard -marm
@@ -1137,11 +1138,11 @@ ${BUILD}/%: ${BUILD}/%.o ${OBJS} ${LIBS}
 
 ${BUILD}/%.o: %.c
 	@${PRINTF} "    CC            $(subst ${BUILD}/,,$@)\n"
-	${Q}${CC} ${CFLAGS} ${INCLUDES} -c -o $@ $<
+	${Q}${CC} ${CFLAGS} ${LDFLAGS}  ${INCLUDES} -c -o $@ $<
 
 ${BUILD}/%.o: ${BUILD}/%.c
 	@${PRINTF} "    CC            $(subst ${BUILD}/,,$@)\n"
-	${Q}${CC} ${CFLAGS} ${INCLUDES} -c -o $@ $<
+	${Q}${CC} ${CFLAGS} ${LDFLAGS} ${INCLUDES} -c -o $@ $<
 
 # ----------------------------------------------------------------------------
 # Here are the special tweaks to the generic rules.