summaryrefslogtreecommitdiff
path: root/mk
diff options
context:
space:
mode:
authorThomas Monjalon <thomas.monjalon@6wind.com>2013-10-23 11:40:56 +0200
committerThomas Monjalon <thomas.monjalon@6wind.com>2014-01-15 18:08:43 +0100
commit0920ada6cbd0db9abf85e6da7ef3aa11faee4e85 (patch)
tree41f22c1b77448d1cc822469d0b44b6fe622785ac /mk
parentc8a8dc3e0c3f6f04a17757c9d8350bfe6548ccc1 (diff)
downloaddpdk-0920ada6cbd0db9abf85e6da7ef3aa11faee4e85.zip
dpdk-0920ada6cbd0db9abf85e6da7ef3aa11faee4e85.tar.gz
dpdk-0920ada6cbd0db9abf85e6da7ef3aa11faee4e85.tar.xz
config: fix combined/shared lib
- Configuration for combined and shared library was only in the template defconfig_x86_64-default-linuxapp-gcc. - CONFIG_RTE_LIBNAME was in the wrong section - RTE_LIBNAME had no quote in "C context" (include/rte_config.h) - and then CONFIG_RTE_LIBNAME quotes were not properly removed in "make context" Signed-off-by: Thomas Monjalon <thomas.monjalon@6wind.com> Acked-by: Olivier Matz <olivier.matz@6wind.com>
Diffstat (limited to 'mk')
-rw-r--r--mk/rte.vars.mk8
1 files changed, 4 insertions, 4 deletions
diff --git a/mk/rte.vars.mk b/mk/rte.vars.mk
index c517dd0..fa5839f 100644
--- a/mk/rte.vars.mk
+++ b/mk/rte.vars.mk
@@ -64,10 +64,6 @@ ifneq ($(BUILDING_RTE_SDK),)
RTE_TARGET := $(RTE_ARCH)-$(RTE_MACHINE)-$(RTE_EXEC_ENV)-$(RTE_TOOLCHAIN)
RTE_SDK_BIN := $(RTE_OUTPUT)
RTE_BUILD_SHARED_LIB := $(CONFIG_RTE_BUILD_SHARED_LIB:"%"=%)
- RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%s"=%)
- ifeq ($(RTE_LIBNAME),)
- RTE_LIBNAME := intel_dpdk
- endif
ifeq ($(RTE_BUILD_SHARED_LIB),)
RTE_BUILD_SHARED_LIB := n
endif
@@ -75,6 +71,10 @@ ifneq ($(BUILDING_RTE_SDK),)
ifeq ($(RTE_BUILD_COMBINE_LIBS),)
RTE_BUILD_COMBINE_LIBS := n
endif
+ RTE_LIBNAME := $(CONFIG_RTE_LIBNAME:"%"=%)
+ ifeq ($(RTE_LIBNAME),)
+ RTE_LIBNAME := intel_dpdk
+ endif
endif
# RTE_TARGET is deducted from config when we are building the SDK.