From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sergio Gonzalez Monroy Subject: [PATCH 3/4] Link apps only against combined lib or individual libs, not both Date: Thu, 2 Oct 2014 16:56:25 +0100 Message-ID: <1412265386-26291-4-git-send-email-sergio.gonzalez.monroy@intel.com> References: <1412265386-26291-1-git-send-email-sergio.gonzalez.monroy@intel.com> To: dev-VfR2kkLFssw@public.gmane.org Return-path: In-Reply-To: <1412265386-26291-1-git-send-email-sergio.gonzalez.monroy-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces-VfR2kkLFssw@public.gmane.org Sender: "dev" Link only against combined library or individual libraries. Signed-off-by: Sergio Gonzalez Monroy --- mk/rte.app.mk | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/mk/rte.app.mk b/mk/rte.app.mk index 34dff2a..6f752dd 100644 --- a/mk/rte.app.mk +++ b/mk/rte.app.mk @@ -59,6 +59,13 @@ LDLIBS += -L$(RTE_SDK_BIN)/lib # ifeq ($(NO_AUTOLIBS),) +ifeq ($(RTE_BUILD_COMBINE_LIBS),y) +LDLIBS += --start-group +LDLIBS += -l$(RTE_LIBNAME) +LDLIBS += $(EXECENV_LDLIBS) +LDLIBS += --end-group +else + LDLIBS += --whole-archive ifeq ($(CONFIG_RTE_LIBRTE_DISTRIBUTOR),y) @@ -218,6 +225,8 @@ LDLIBS += --end-group LDLIBS += --no-whole-archive +endif # ifeq ($(RTE_BUILD_COMBINE_LIBS),y) + endif # ifeq ($(NO_AUTOLIBS),) LDLIBS += $(CPU_LDLIBS) @@ -235,10 +244,6 @@ build: _postbuild exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) -ifeq ($(RTE_BUILD_COMBINE_LIBS),y) -LDLIBS += -l$(RTE_LIBNAME) -endif - ifeq ($(LINK_USING_CC),1) LDLIBS := $(call linkerprefix,$(LDLIBS)) LDFLAGS := $(call linkerprefix,$(LDFLAGS)) -- 1.9.3