From 4628df5cc8898071d698ee2e70bb21c736cd2c6c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Markus=20Fr=C3=B6schle?= Date: Mon, 25 Dec 2017 13:09:18 +0100 Subject: [PATCH] remove LIBCMINI dependency this needs to be disabled until libcmini is available for travis-ci builds --- tos/bascook/Makefile | 9 +++++---- tos/bascook/m5475/.gitignore | 1 + 2 files changed, 6 insertions(+), 4 deletions(-) create mode 100644 tos/bascook/m5475/.gitignore diff --git a/tos/bascook/Makefile b/tos/bascook/Makefile index b2e2b88..ffcc668 100755 --- a/tos/bascook/Makefile +++ b/tos/bascook/Makefile @@ -23,10 +23,11 @@ TOPDIR= ../.. BAS_INCLUDE=-I$(TOPDIR)/../BaS_gcc/include -LIBCMINI=$(TOPDIR)/../libcmini/libcmini +#LIBCMINI=$(TOPDIR)/../libcmini/libcmini -INCLUDE=-I$(LIBCMINI)/include $(BAS_INCLUDE) -nostdlib -LIBS=-lcmini -nostdlib -lgcc +#INCLUDE=-I$(LIBCMINI)/include $(BAS_INCLUDE) -nostdlib +INCLUDE=$(BAS_INCLUDE) +#LIBS=-lcmini -nostdlib -lgcc CC=$(PREFIX)/bin/gcc CC=$(CROSSBINDIR)gcc @@ -77,7 +78,7 @@ $(1)/objs/%.o:$(SRCDIR)/%.S $(1)_OBJS=$(patsubst %,$(1)/objs/%,$(OBJS)) $(1)/$(APP): $$($(1)_OBJS) @echo CC $$< - @$(CC) $$(CFLAGS) -o $$@ $(LIBCMINI)/m5475/startup.o $$($(1)_OBJS) -L$(LIBCMINI)/m5475 $(LIBS) + @$(CC) $$(CFLAGS) -o $$@ $$($(1)_OBJS) @$(STRIP) $$@ endef $(foreach DIR,$(TRGTDIRS),$(eval $(call CC_TEMPLATE,$(DIR)))) diff --git a/tos/bascook/m5475/.gitignore b/tos/bascook/m5475/.gitignore new file mode 100644 index 0000000..5761abc --- /dev/null +++ b/tos/bascook/m5475/.gitignore @@ -0,0 +1 @@ +*.o