Dear Daniel Schwierzeck,
Signed-off-by: Daniel Schwierzeck daniel.schwierzeck@gmail.com
Makefile | 18 +++++++----------- 1 file changed, 7 insertions(+), 11 deletions(-)
diff --git a/Makefile b/Makefile index 2bde73c..cf3c56d 100644 --- a/Makefile +++ b/Makefile @@ -225,15 +225,15 @@ endif
OBJS := $(addprefix $(obj),$(OBJS))
+HAVE_VENDOR_COMMON_LIB := $(shell [ -f board/$(VENDOR)/common/Makefile ] \
&& echo y || echo n)LIBS-y += lib/libgeneric.o LIBS-y += lib/lzma/liblzma.o LIBS-y += lib/lzo/liblzo.o LIBS-y += lib/zlib/libz.o -ifeq ($(CONFIG_TIZEN),y) -LIBS-y += lib/tizen/libtizen.o -endif -LIBS-y += $(shell if [ -f board/$(VENDOR)/common/Makefile ]; then echo \
- "board/$(VENDOR)/common/lib$(VENDOR).o"; fi)
+LIBS-$(CONFIG_TIZEN) += lib/tizen/libtizen.o +LIBS-$(HAVE_VENDOR_COMMON_LIB) += board/$(VENDOR)/common/lib$(VENDOR).o
It's apparently this change to HAVE_VENDOR_COMMON_LIB that breaks stuff :-(
LIBS-y += $(CPUDIR)/lib$(CPU).o ifdef SOC LIBS-y += $(CPUDIR)/$(SOC)/lib$(SOC).o
[...]
Best regards, Marek Vasut