From: Krzysztof Kanas <kka...@marvell.com>
The configuration for native-linux-* targets is done using symbolic
links, e.g
config/defconfig_x86_64-native-linux-gcc
which points to
config/defconfig_x86_64-native-linuxapp-gcc.
When configuring mk will output correct target based on
RTE_CONFIG_TEMPLATE.
When building mk will use RTE_TARGET variable which is crated out of
CONFIG_RTE_EXEC_ENV, and will be different from configuration
Fix by setting CONFIG_RTE_EXEC_ENV to record correct value, also adjust
makefile tests for CONFIG_RTE_EXEC_ENV.
Bugzilla ID: 288
Fixes: b283164694b6 ("mk: print target when reporting build complete")
Cc: bruce.richard...@intel.com
Cc: jasvinder.si...@intel.com
Signed-off-by: Krzysztof Kanas <kka...@marvell.com>
---
config/defconfig_x86_64-native-linuxapp-gcc | 1 +
drivers/net/softnic/Makefile | 2 +-
mk/rte.sdkbuild.mk | 2 +-
3 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/config/defconfig_x86_64-native-linuxapp-gcc
b/config/defconfig_x86_64-native-linuxapp-gcc
index db67066a57e3..b1f584427f1d 100644
--- a/config/defconfig_x86_64-native-linuxapp-gcc
+++ b/config/defconfig_x86_64-native-linuxapp-gcc
@@ -4,6 +4,7 @@
#include "common_linux"
CONFIG_RTE_MACHINE="native"
+CONFIG_RTE_EXEC_ENV="linux"
CONFIG_RTE_ARCH="x86_64"
CONFIG_RTE_ARCH_X86_64=y
diff --git a/drivers/net/softnic/Makefile b/drivers/net/softnic/Makefile
index 64885dd86aeb..29a6af7bb75e 100644
--- a/drivers/net/softnic/Makefile
+++ b/drivers/net/softnic/Makefile
@@ -45,7 +45,7 @@ SRCS-$(CONFIG_RTE_LIBRTE_PMD_SOFTNIC) += conn.c
#
SYMLINK-y-include += rte_eth_softnic.h
-ifneq ($(CONFIG_RTE_EXEC_ENV),"linuxapp")
+ifneq ($(patsubst "linux%","linux",$(CONFIG_RTE_EXEC_ENV)),"linux")
$(info Softnic PMD can only operate in a linux environment, \
please change the definition of the RTE_TARGET environment variable)
all:
diff --git a/mk/rte.sdkbuild.mk b/mk/rte.sdkbuild.mk
index b512de1ecdf3..8bb0f52bb343 100644
--- a/mk/rte.sdkbuild.mk
+++ b/mk/rte.sdkbuild.mk
@@ -27,7 +27,7 @@ CLEANDIRS = $(addsuffix _clean,$(ROOTDIRS-y) $(ROOTDIRS-n)
$(ROOTDIRS-))
.PHONY: build
build: $(ROOTDIRS-y)
- @echo "Build complete [$(RTE_TARGET)]"
+ @echo "Build complete [$(patsubst defconfig_%,%,$(notdir
$(RTE_CONFIG_TEMPLATE)))]"
.PHONY: clean
clean: $(CLEANDIRS)
--
2.20.1
