git.droids-corp.org
/
dpdk.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ac33030
)
mk: always preprocess template config file
author
Intel
<intel.com>
Fri, 8 Nov 2013 02:00:00 +0000
(
03:00
+0100)
committer
Thomas Monjalon
<thomas.monjalon@6wind.com>
Tue, 19 Nov 2013 17:23:24 +0000
(18:23 +0100)
Signed-off-by: Intel
mk/rte.sdkconfig.mk
patch
|
blob
|
history
diff --git
a/mk/rte.sdkconfig.mk
b/mk/rte.sdkconfig.mk
index
ace65b0
..
552ba69
100644
(file)
--- a/
mk/rte.sdkconfig.mk
+++ b/
mk/rte.sdkconfig.mk
@@
-54,12
+54,9
@@
else
$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
$(RTE_OUTPUT)/.config: $(RTE_CONFIG_TEMPLATE) FORCE
@[ -d $(RTE_OUTPUT) ] || mkdir -p $(RTE_OUTPUT)
$(Q)if [ "$(RTE_CONFIG_TEMPLATE)" != "" -a -f "$(RTE_CONFIG_TEMPLATE)" ]; then \
- if grep -q '#include' $(RTE_CONFIG_TEMPLATE) ; then \
- $(CPP) -undef -C -P -x assembler-with-cpp -fdirectives-only \
- -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
- else \
- cp $(RTE_CONFIG_TEMPLATE) $(RTE_OUTPUT)/.config_tmp ; \
- fi ; \
+ $(CPP) -undef -P -x assembler-with-cpp \
+ -fdirectives-only -ffreestanding \
+ -o $(RTE_OUTPUT)/.config_tmp $(RTE_CONFIG_TEMPLATE) ; \
if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config; then \
cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \
fi ; \
if ! cmp -s $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config; then \
cp $(RTE_OUTPUT)/.config_tmp $(RTE_OUTPUT)/.config ; \
fi ; \