summaryrefslogtreecommitdiff
path: root/mk/internal
diff options
context:
space:
mode:
authorLuca Boccassi <lboccass@brocade.com>2016-08-30 18:25:04 +0100
committerThomas Monjalon <thomas.monjalon@6wind.com>2016-09-23 18:21:19 +0200
commitf25d44d92ad00867bb6ac1e80782240fd884251f (patch)
tree8ac5cd3420f25bf1c589665d296ba382f98a2fc4 /mk/internal
parent684e6f4a78307796c45018c77908be4c96999e45 (diff)
downloaddpdk-f25d44d92ad00867bb6ac1e80782240fd884251f.zip
dpdk-f25d44d92ad00867bb6ac1e80782240fd884251f.tar.gz
dpdk-f25d44d92ad00867bb6ac1e80782240fd884251f.tar.xz
mk: add missing preprocessor options
Some targets in mk/internal/rte.compile-pre.mk are calling CC or HOSTCC without passing CPPFLAGS, EXTRA_CPPFLAGS or HOST_CPPFLAGS, HOST_EXTRA_CPPFLAGS. On Debian/Ubuntu builds this means that preprocessor flags set by the dpkg-buildpackage environment, like hardening flags, are not correctly passed to all objects builds. Signed-off-by: Luca Boccassi <lboccass@brocade.com> Acked-by: Christian Ehrhardt <christian.ehrhardt@canonical.com>
Diffstat (limited to 'mk/internal')
-rw-r--r--mk/internal/rte.compile-pre.mk10
1 files changed, 5 insertions, 5 deletions
diff --git a/mk/internal/rte.compile-pre.mk b/mk/internal/rte.compile-pre.mk
index f740179..7a1a62a 100644
--- a/mk/internal/rte.compile-pre.mk
+++ b/mk/internal/rte.compile-pre.mk
@@ -74,18 +74,18 @@ CMDS-all := $(CMDS-y) $(CMDS-n) $(CMDS-)
# command to compile a .c file to generate an object
ifeq ($(USE_HOST),1)
-C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CFLAGS) \
- $(CFLAGS_$(@)) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
+C_TO_O = $(HOSTCC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(HOST_CPPFLAGS) $(HOST_CFLAGS) \
+ $(CFLAGS_$(@)) $(HOST_EXTRA_CPPFLAGS) $(HOST_EXTRA_CFLAGS) -o $@ -c $<
C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," HOSTCC $(@)")
else
-C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CFLAGS) \
- $(CFLAGS_$(@)) $(EXTRA_CFLAGS) -o $@ -c $<
+C_TO_O = $(CC) -Wp,-MD,$(call obj2dep,$(@)).tmp $(CPPFLAGS) $(CFLAGS) \
+ $(CFLAGS_$(@)) $(EXTRA_CPPFLAGS) $(EXTRA_CFLAGS) -o $@ -c $<
C_TO_O_STR = $(subst ','\'',$(C_TO_O)) #'# fix syntax highlight
C_TO_O_DISP = $(if $(V),"$(C_TO_O_STR)"," CC $(@)")
endif
PMDINFO_GEN = $(RTE_SDK_BIN)/app/dpdk-pmdinfogen $@ $@.pmd.c
-PMDINFO_CC = $(CC) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
+PMDINFO_CC = $(CC) $(CPPFLAGS) $(CFLAGS) -c -o $@.pmd.o $@.pmd.c
PMDINFO_LD = $(CROSS)ld $(LDFLAGS) -r -o $@.o $@.pmd.o $@
PMDINFO_TO_O = if grep -q 'PMD_REGISTER_DRIVER(.*)' $<; then \
echo "$(if $V,$(PMDINFO_GEN), PMDINFO $@.pmd.c)" && \