From: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Date: Wed, 16 Mar 2016 23:22:23 +0000 (+0000)
Subject: mk: fix linker script when re-building
X-Git-Tag: spdx-start~7253
X-Git-Url: http://git.droids-corp.org/?p=dpdk.git;a=commitdiff_plain;h=9f8d48e56931b0bd145534f5e145fff7e8ef598d

mk: fix linker script when re-building

The linker script is generated by simply finding all libraries in
RTE_OUTPUT/lib.

The issue shows up when re-building the DPDK, hence already having a
linker script in that directory, resulting in the linker script
including itself.

That does not play well with the linker.

Simply filtering the linker script from all the found libraries solves
the problem.

Fixes: 948fd64befc3 ("mk: replace the combined library with a linker script")

Signed-off-by: Sergio Gonzalez Monroy <sergio.gonzalez.monroy@intel.com>
Acked-by: Panu Matilainen <pmatilai@redhat.com>
---

diff --git a/mk/rte.combinedlib.mk b/mk/rte.combinedlib.mk
index fe4817bbc5..449358b33d 100644
--- a/mk/rte.combinedlib.mk
+++ b/mk/rte.combinedlib.mk
@@ -42,7 +42,7 @@ endif
 RTE_LIBNAME := dpdk
 COMBINEDLIB := lib$(RTE_LIBNAME)$(EXT)
 
-LIBS := $(notdir $(wildcard $(RTE_OUTPUT)/lib/*$(EXT)))
+LIBS := $(filter-out $(COMBINEDLIB), $(notdir $(wildcard $(RTE_OUTPUT)/lib/*$(EXT))))
 
 all: FORCE
 	$(Q)echo "GROUP ( $(LIBS) )" > $(RTE_OUTPUT)/lib/$(COMBINEDLIB)