1 From a4d00a8bf4684a4cf101b026c7c49a993cf9b989 Mon Sep 17 00:00:00 2001
2 From: Luca Boccassi <lboccass@brocade.com>
3 Date: Tue, 30 Aug 2016 17:01:49 +0100
4 Subject: [PATCH] mk: add missing *CPPFLAGS to rte.compile-pre.mk
6 Some targets in mk/internal/rte.compile-pre.mk are calling CC or
7 HOSTCC without passing CPPFLAGS, EXTRA_CPPFLAGS or HOST_CPPFLAGS,
9 On Debian/Ubuntu builds this means that preprocessor flags set by the
10 dpkg-buildpackage environment, like hardening flags, are not
11 correctly passed to all objects builds.
13 Signed-off-by: Luca Boccassi <lboccass@brocade.com>
15 mk/internal/rte.compile-pre.mk | 10 +++++-----
16 1 file changed, 5 insertions(+), 5 deletions(-)
18 --- a/mk/internal/rte.compile-pre.mk
19 +++ b/mk/internal/rte.compile-pre.mk
20 @@ -74,18 +74,18 @@ CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-)
22 # command to compile a .c file to generate an object
24 -C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CFLAGS) \
25 - $(CFLAGS_$(@)) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
26 +C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \
27 + $(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
28 C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
29 C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)")
31 -C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CFLAGS) \
32 - $(CFLAGS_$(@)) $(EXTRA_CFLAGS) -o $@ -c $<
33 +C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \
34 + $(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
35 C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
36 C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)")
38 PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c
39 -PMDINFO_CC = $(CC) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
40 +PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
41 PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@
42 PMDINFO_TO_O = if grep -q 'PMD_REGISTER_DRIVER(.*)' $<; then \
43 echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \