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>
16 Origin: Upstream, http://dpdk.org/dev/patchwork/patch/15549/
17 Author: Luca Boccassi <lboccass@brocade.com>
18 Last-Update: 2016-08-30
20 mk/internal/rte.compile-pre.mk | 10 +++++-----
21 1 file changed, 5 insertions(+), 5 deletions(-)
23 --- a/mk/internal/rte.compile-pre.mk
24 +++ b/mk/internal/rte.compile-pre.mk
25 @@ -74,18 +74,18 @@ CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-)
27 # command to compile a .c file to generate an object
29 -C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CFLAGS) \
30 - $(CFLAGS_$(@)) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
31 +C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \
32 + $(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
33 C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
34 C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)")
36 -C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CFLAGS) \
37 - $(CFLAGS_$(@)) $(EXTRA_CFLAGS) -o $@ -c $<
38 +C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \
39 + $(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
40 C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
41 C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)")
43 PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c
44 -PMDINFO_CC = $(CC) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
45 +PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
46 PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@
47 PMDINFO_TO_O = if grep -q 'PMD_REGISTER_DRIVER(.*)' $<; then \
48 echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \