michael/lean2
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix(build): delete incorrect/old .d and .olean files, detect errors when generating .d files.

Browse source 
Signed-off-by: Leonardo de Moura <leonardo@microsoft.com>
This commit is contained in:
Leonardo de Moura 2014-08-04 13:55:53 -07:00
parent d5bb7d45ec
commit 59f6cb5962
2 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
library/Makefile.common
View file

@ -7,15 +7,17 @@ DEP_FILES = $(LEAN_FILES:.lean=.d)
all: $(OLEAN_FILES) $(DEP_FILES)
%.olean: %.lean
$(LEAN) $(LEAN_OPTIONS) $< -o $@
%.olean: %.lua
@rm -f $@
$(LEAN) $(LEAN_OPTIONS) $< -o $@
%.d: %.lean
@echo Making dependency file \'$@\' ...
@rm -f $@
@rm -f $@.tmp
@$(LEAN) --deps $< > $@.tmp
@printf "$(basename $@).olean : $< $@ " > $@
@$(LEAN) --deps $< | tr "\n" " " >> $@
@tr "\n" " " < $@.tmp >> $@
@rm -f $@.tmp
-include $(LEAN_FILES:.lean=.d)

2
src/shell/lean.cpp
View file

@ -258,7 +258,7 @@ int main(int argc, char ** argv) {
}
return ok ? 0 : 1;
} catch (lean::exception & ex) {
::lean::display_error(regular(env, ios), nullptr, ex);
::lean::display_error(diagnostic(env, ios), nullptr, ex);
}
return 1;
}