From e66443fdb5355e68cfdbbdd37248c4b7eb4968f5 Mon Sep 17 00:00:00 2001 From: Scott Wood Date: Tue, 14 Aug 2012 01:44:29 +0000 Subject: [PATCH] Makefile: fix HAVE_VENDOR_COMMON_LIB Commit 8b5a02640adf77301f943e8754992c50df004e8a ("Makefile: cosmetic: optimize usage of LIBS-y") broke the build of boards that have a board vendor "common" directory, by introducing a space between "LIBS-" and "y". Signed-off-by: Scott Wood Signed-off-by: Daniel Schwierzeck Acked-by: Kim Phillips --- Makefile | 2 +- spl/Makefile | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 5ce5cc3..947f3ff 100644 --- a/Makefile +++ b/Makefile @@ -225,7 +225,7 @@ endif OBJS := $(addprefix $(obj),$(OBJS)) -HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile), y, n) +HAVE_VENDOR_COMMON_LIB = $(if $(wildcard board/$(VENDOR)/common/Makefile),y,n) LIBS-y += lib/libgeneric.o LIBS-y += lib/lzma/liblzma.o diff --git a/spl/Makefile b/spl/Makefile index e9ecb9b..2cf7bda 100644 --- a/spl/Makefile +++ b/spl/Makefile @@ -23,7 +23,7 @@ include $(TOPDIR)/config.mk # We want the final binaries in this directory obj := $(OBJTREE)/spl/ -HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile), y, n) +HAVE_VENDOR_COMMON_LIB = $(if $(wildcard $(SRCTREE)/board/$(VENDOR)/common/Makefile),y,n) ifdef CONFIG_SPL_START_S_PATH START_PATH := $(subst ",,$(CONFIG_SPL_START_S_PATH)) -- 2.7.4