X-Git-Url: http://git.droids-corp.org/?a=blobdiff_plain;ds=sidebyside;f=mk%2Frte.lib.mk;h=13115d146ef531e1b9f53b1470b93d7be5b376b1;hb=0cc67a96e4867d0b35b94fcb29114c6ddfe46efb;hp=5b72475d23cbb0995234703ddfa03203e5c16fc6;hpb=630f6ec11ea2354b0765331b09589740a222ff32;p=dpdk.git diff --git a/mk/rte.lib.mk b/mk/rte.lib.mk index 5b72475d23..13115d146e 100644 --- a/mk/rte.lib.mk +++ b/mk/rte.lib.mk @@ -33,7 +33,6 @@ include $(RTE_SDK)/mk/internal/rte.compile-pre.mk include $(RTE_SDK)/mk/internal/rte.install-pre.mk include $(RTE_SDK)/mk/internal/rte.clean-pre.mk include $(RTE_SDK)/mk/internal/rte.build-pre.mk -include $(RTE_SDK)/mk/internal/rte.depdirs-pre.mk EXTLIB_BUILD ?= n @@ -78,19 +77,19 @@ exe2cmd = $(strip $(call dotfile,$(patsubst %,%.cmd,$(1)))) ifeq ($(LINK_USING_CC),1) # Override the definition of LD here, since we're linking with CC -LD := $(CC) $(CPU_CFLAGS) +LD := $(CC) $(CPU_CFLAGS) $(EXTRA_CFLAGS) _CPU_LDFLAGS := $(call linkerprefix,$(CPU_LDFLAGS)) override EXTRA_LDFLAGS := $(call linkerprefix,$(EXTRA_LDFLAGS)) else _CPU_LDFLAGS := $(CPU_LDFLAGS) endif -# Translate DEPDIRS-y into LDLIBS +# Translate DEPDIRS into LDLIBS # Ignore (sub)directory dependencies which do not provide an actual library -_IGNORE_DIRS = lib/librte_eal/% lib/librte_compat -_DEPDIRS = $(filter-out $(_IGNORE_DIRS),$(DEPDIRS-y)) +_IGNORE_DIRS = librte_eal/% librte_compat +_DEPDIRS = $(filter-out $(_IGNORE_DIRS),$(DEPDIRS)) _LDDIRS = $(subst librte_ether,librte_ethdev,$(_DEPDIRS)) -LDLIBS += $(subst lib/lib,-l,$(_LDDIRS)) +LDLIBS += $(subst lib,-l,$(_LDDIRS)) O_TO_A = $(AR) crDs $(LIB) $(OBJS-y) O_TO_A_STR = $(subst ','\'',$(O_TO_A)) #'# fix syntax highlight @@ -183,7 +182,6 @@ include $(RTE_SDK)/mk/internal/rte.compile-post.mk include $(RTE_SDK)/mk/internal/rte.install-post.mk include $(RTE_SDK)/mk/internal/rte.clean-post.mk include $(RTE_SDK)/mk/internal/rte.build-post.mk -include $(RTE_SDK)/mk/internal/rte.depdirs-post.mk .PHONY: FORCE FORCE: