From effe443877c589a6a466093ed0ac9704b165b90a Mon Sep 17 00:00:00 2001 From: Mans Rullgard Date: Wed, 10 Oct 2012 23:02:57 +0100 Subject: [PATCH] build: do not use LIB as variable name The Microsoft linker uses the LIB environment variable which clashes with a make variable of the same name. Signed-off-by: Mans Rullgard --- library.mak | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/library.mak b/library.mak index 64b5f2b2d5..b36593504c 100644 --- a/library.mak +++ b/library.mak @@ -33,11 +33,11 @@ install-libs-$(CONFIG_STATIC): install-lib$(NAME)-static install-libs-$(CONFIG_SHARED): install-lib$(NAME)-shared define RULES -$(EXAMPLES) $(TOOLS): LIB = $(FULLNAME:%=$(LD_LIB)) -$(TESTPROGS): LIB = $(SUBDIR)$(LIBNAME) +$(EXAMPLES) $(TOOLS): THISLIB = $(FULLNAME:%=$(LD_LIB)) +$(TESTPROGS): THISLIB = $(SUBDIR)$(LIBNAME) $(EXAMPLES) $(TESTPROGS) $(TOOLS): %$(EXESUF): %.o - $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(LIB) $(FFEXTRALIBS) $$(ELIBS) + $$(LD) $(LDFLAGS) $$(LD_O) $$(filter %.o,$$^) $$(THISLIB) $(FFEXTRALIBS) $$(ELIBS) $(SUBDIR)$(SLIBNAME): $(SUBDIR)$(SLIBNAME_WITH_MAJOR) $(Q)cd ./$(SUBDIR) && $(LN_S) $(SLIBNAME_WITH_MAJOR) $(SLIBNAME)