From 278b2c24d6554a1fd73a425f79ab2877370b4fc8 Mon Sep 17 00:00:00 2001 From: Nicolas Schodet Date: Sat, 8 Dec 2012 09:01:37 +0100 Subject: digital/ucoolib/build: stop if configuration fails --- digital/ucoolib/build/arch.mk | 6 +++--- digital/ucoolib/build/config.mk | 3 +++ 2 files changed, 6 insertions(+), 3 deletions(-) (limited to 'digital/ucoolib/build') diff --git a/digital/ucoolib/build/arch.mk b/digital/ucoolib/build/arch.mk index 61dbb142..01b797f8 100644 --- a/digital/ucoolib/build/arch.mk +++ b/digital/ucoolib/build/arch.mk @@ -43,15 +43,15 @@ $$1.$1$$$$($1_ELF_SUFFIX): $$$$(patsubst %,$$(OBJDIR)/%.$1.o,\ endef $$(foreach prog,$$($1_PROGS),$$(eval $$(call $1_PROG_template,$$(prog)))) -$$(OBJDIR)/%.$1.o: %.c $$(COMPILE_DEPS) | $$(OBJDIR) +$$(OBJDIR)/%.$1.o: %.c $$(COMPILE_DEPS) | $$(OBJDIR) $$(COMPILE_ORDER_DEPS) @echo "CC [$1] $$<" $$Q$$($1_COMPILE.c) -o $$@ $$< -$$(OBJDIR)/%.$1.o: %.cc $$(COMPILE_DEPS) | $$(OBJDIR) +$$(OBJDIR)/%.$1.o: %.cc $$(COMPILE_DEPS) | $$(OBJDIR) $$(COMPILE_ORDER_DEPS) @echo "CXX [$1] $$<" $$Q$$($1_COMPILE.cc) -o $$@ $$< -$$(OBJDIR)/%.$1.o: %.S $$(COMPILE_DEPS) | $$(OBJDIR) +$$(OBJDIR)/%.$1.o: %.S $$(COMPILE_DEPS) | $$(OBJDIR) $$(COMPILE_ORDER_DEPS) @echo "AS [$1] $$<" $$Q$$($1_COMPILE.S) -o $$@ $$< diff --git a/digital/ucoolib/build/config.mk b/digital/ucoolib/build/config.mk index 6a0e6624..cdffc16e 100644 --- a/digital/ucoolib/build/config.mk +++ b/digital/ucoolib/build/config.mk @@ -18,6 +18,9 @@ CONFIG_FORCE := CONFIG_FORCE endif endif +# This configuration is really needed, make sure to stop here if it fails. +COMPILE_ORDER_DEPS += $(OBJDIR)/config.list + clean: config-clean .PHONY: config-clean CONFIG_FORCE -- cgit v1.2.3