From mboxrd@z Thu Jan 1 00:00:00 1970 From: Thomas Monjalon Subject: [PATCH v2 1/7] mk: remove traces of combined library Date: Sun, 26 Jun 2016 18:41:59 +0200 Message-ID: <1466959325-9426-2-git-send-email-thomas.monjalon@6wind.com> References: <1466959325-9426-1-git-send-email-thomas.monjalon@6wind.com> Cc: dev@dpdk.org To: Panu Matilainen Return-path: Received: from mail-wm0-f54.google.com (mail-wm0-f54.google.com [74.125.82.54]) by dpdk.org (Postfix) with ESMTP id 3B58A5AA1 for ; Sun, 26 Jun 2016 18:42:11 +0200 (CEST) Received: by mail-wm0-f54.google.com with SMTP id v199so73581136wmv.0 for ; Sun, 26 Jun 2016 09:42:11 -0700 (PDT) In-Reply-To: <1466959325-9426-1-git-send-email-thomas.monjalon@6wind.com> List-Id: patches and discussions about DPDK List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: dev-bounces@dpdk.org Sender: "dev" Fixes: 948fd64befc3 ("mk: replace the combined library with a linker script") Signed-off-by: Thomas Monjalon --- mk/rte.lib.mk | 18 ------------------ 1 file changed, 18 deletions(-) diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk index 1ff403f..d2523ee 100644 --- a/mk/rte.lib.mk +++ b/mk/rte.lib.mk @@ -102,24 +102,6 @@ O_TO_S_DO = @set -e; \ $(O_TO_S) && \ echo $(O_TO_S_CMD) > $(call exe2cmd,$(@)) -ifeq ($(CONFIG_RTE_BUILD_SHARED_LIB),n) -O_TO_C = $(AR) crus $(LIB_ONE) $(OBJS-y) -O_TO_C_STR = $(subst ','\'',$(O_TO_C)) #'# fix syntax highlight -O_TO_C_DISP = $(if $(V),"$(O_TO_C_STR)"," AR_C $(@)") -O_TO_C_DO = @set -e; \ - $(lib_dir) \ - $(copy_obj) -else -O_TO_C = $(LD) -shared $(OBJS-y) -o $(LIB_ONE) -O_TO_C_STR = $(subst ','\'',$(O_TO_C)) #'# fix syntax highlight -O_TO_C_DISP = $(if $(V),"$(O_TO_C_STR)"," LD_C $(@)") -O_TO_C_DO = @set -e; \ - $(lib_dir) \ - $(copy_obj) -endif - -copy_obj = cp -f $(OBJS-y) $(RTE_OUTPUT)/build/lib; -lib_dir = [ -d $(RTE_OUTPUT)/lib ] || mkdir -p $(RTE_OUTPUT)/lib; -include .$(LIB).cmd # -- 2.7.0