From patchwork Thu Oct 2 15:56:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sergio Gonzalez Monroy X-Patchwork-Id: 702 Return-Path: Received: from mga01.intel.com (mga01.intel.com [192.55.52.88]) by dpdk.org (Postfix) with ESMTP id 097676A9C for ; Thu, 2 Oct 2014 17:49:40 +0200 (CEST) Received: from fmsmga001.fm.intel.com ([10.253.24.23]) by fmsmga101.fm.intel.com with ESMTP; 02 Oct 2014 08:56:28 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.04,639,1406617200"; d="scan'208";a="599871282" Received: from irvmail001.ir.intel.com ([163.33.26.43]) by fmsmga001.fm.intel.com with ESMTP; 02 Oct 2014 08:56:27 -0700 Received: from sivswdev02.ir.intel.com (sivswdev02.ir.intel.com [10.237.217.46]) by irvmail001.ir.intel.com (8.14.3/8.13.6/MailSET/Hub) with ESMTP id s92FuR9c020621 for ; Thu, 2 Oct 2014 16:56:27 +0100 Received: from sivswdev02.ir.intel.com (localhost [127.0.0.1]) by sivswdev02.ir.intel.com with ESMTP id s92FuQtE026349 for ; Thu, 2 Oct 2014 16:56:26 +0100 Received: (from smonroy@localhost) by sivswdev02.ir.intel.com with id s92FuQnp026345 for dev@dpdk.org; Thu, 2 Oct 2014 16:56:26 +0100 From: Sergio Gonzalez Monroy To: dev@dpdk.org Date: Thu, 2 Oct 2014 16:56:25 +0100 Message-Id: <1412265386-26291-4-git-send-email-sergio.gonzalez.monroy@intel.com> X-Mailer: git-send-email 1.8.5.4 In-Reply-To: <1412265386-26291-1-git-send-email-sergio.gonzalez.monroy@intel.com> References: <1412265386-26291-1-git-send-email-sergio.gonzalez.monroy@intel.com> Subject: [dpdk-dev] [PATCH 3/4] Link apps only against combined lib or individual libs, not both X-BeenThere: dev@dpdk.org X-Mailman-Version: 2.1.15 Precedence: list List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 02 Oct 2014 15:49:42 -0000 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))