Merge pull request #5830 from jcowgill/makefile-indentation

makefile.tmpl: fix error handling and cleanups
This commit is contained in:
Dennis Felsing 2017-06-20 21:31:17 +02:00 • committed by GitHub
commit fd5ddab581

View file

@ -65,8 +65,7 @@ ifeq ($(uos),haiku)
myos = haiku myos = haiku
endif endif
ifndef uos ifndef uos
@echo "Error: unknown operating system: $(uos)" $(error unknown operating system: $(uos))
@exit 1
endif endif
ifeq ($(ucpu),i386) ifeq ($(ucpu),i386)
@ -131,8 +130,7 @@ ifeq ($(ucpu),armv6l)
mycpu = arm mycpu = arm
endif endif
ifndef ucpu ifndef ucpu
@echo "Error: unknown processor : $(ucpu)" $(error unknown processor : $(ucpu))
@exit 1
endif endif
# for osA in 1..c.oses.len: # for osA in 1..c.oses.len:
@ -150,8 +148,7 @@ endif
# end for # end for
ifeq ($(strip $(oFiles)),) ifeq ($(strip $(oFiles)),)
@echo "Error: no C code generated for: [$(myos): $(mycpu)]" $(error no C code generated for: [$(myos): $(mycpu)])
@exit 1
endif endif
%.o: %.c %.o: %.c