From 7528ad358a4cb30d5fe1f6d5e638abb726bca280 Mon Sep 17 00:00:00 2001 From: Thomas Monjalon Date: Sat, 25 Jun 2016 11:19:15 +0200 Subject: [PATCH] mk: remove traces of combined library 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 1ff403f5ef..d2523ee303 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.20.1