From 0731b5e07c42115eb214e507d72b0993521c6518 Mon Sep 17 00:00:00 2001 From: Yong Liu Date: Wed, 17 Dec 2014 17:20:44 +0800 Subject: [PATCH] mk: fix link to not combined libraries Commit 944088c2abbe ("fix link to combined library") introduced a check with a wrong configuration option name. So link is broken in the case combined library is not enabled. main.o: In function `rte_pktmbuf_free': main.c:(.text+0x9c): undefined reference to `per_lcore__lcore_id' Signed-off-by: Yong Liu Acked-by: Bruce Richardson [Thomas: fix option name in comments] Acked-by: Thomas Monjalon --- mk/rte.app.mk | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 5fc3118db0..3c35985c93 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -61,7 +61,7 @@ ifeq ($(NO_AUTOLIBS),) LDLIBS += --whole-archive -ifeq ($(RTE_BUILD_COMBINE_LIBS),n) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n) ifeq ($(CONFIG_RTE_LIBRTE_DISTRIBUTOR),y) LDLIBS += -lrte_distributor @@ -121,7 +121,7 @@ LDLIBS += -lm LDLIBS += -lrt endif -endif # ! RTE_BUILD_COMBINE_LIBS +endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS ifeq ($(CONFIG_RTE_LIBRTE_PMD_PCAP),y) LDLIBS += -lpcap @@ -129,7 +129,7 @@ endif LDLIBS += --start-group -ifeq ($(RTE_BUILD_COMBINE_LIBS),n) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),n) ifeq ($(CONFIG_RTE_LIBRTE_KVARGS),y) LDLIBS += -lrte_kvargs @@ -226,7 +226,7 @@ endif endif # plugins -endif # ! RTE_BUILD_COMBINE_LIBS +endif # ! CONFIG_RTE_BUILD_COMBINE_LIBS LDLIBS += $(EXECENV_LDLIBS) @@ -251,7 +251,7 @@ build: _postbuild exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) +ifeq ($(CONFIG_RTE_BUILD_COMBINE_LIBS),y) LDLIBS += -l$(RTE_LIBNAME) endif -- 2.20.1