From 8c37e477147824e21038da2c0a4956951481be93 Mon Sep 17 00:00:00 2001 From: Jason Gross Date: Wed, 28 Jun 2017 13:59:49 -0400 Subject: Make the same display on windows and linux Do this by removing windows line endings via sed --- Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Makefile b/Makefile index 01f8f5419..ffdd76a29 100644 --- a/Makefile +++ b/Makefile @@ -134,7 +134,7 @@ Makefile.coq: Makefile _CoqProject $(DISPLAY_NON_JAVA_VO:.vo=.log) : %Display.log : %.vo %Display.v src/Compilers/Z/CNotations.vo src/Specific/IntegrationTestDisplayCommon.vo $(SHOW)"COQC $*Display > $@" - $(HIDE)$(COQC) $(COQDEBUG) $(COQFLAGS) $*Display.v > $@.tmp && mv -f $@.tmp $@ + $(HIDE)$(COQC) $(COQDEBUG) $(COQFLAGS) $*Display.v | sed s'/\r\n/\n/g' > $@.tmp && mv -f $@.tmp $@ c: $(DISPLAY_NON_JAVA_VO:Display.vo=.c) $(DISPLAY_NON_JAVA_VO:Display.vo=.h) @@ -146,7 +146,7 @@ $(DISPLAY_NON_JAVA_VO:Display.vo=.h) : %.h : %Display.log extract-function-heade $(DISPLAY_JAVA_VO:.vo=.log) : %JavaDisplay.log : %.vo %JavaDisplay.v src/Compilers/Z/JavaNotations.vo src/Specific/IntegrationTestDisplayCommon.vo $(SHOW)"COQC $*JavaDisplay > $@" - $(HIDE)$(COQC) $(COQDEBUG) $(COQFLAGS) $*JavaDisplay.v > $@.tmp && mv -f $@.tmp $@ + $(HIDE)$(COQC) $(COQDEBUG) $(COQFLAGS) $*JavaDisplay.v | sed s'/\r\n/\n/g' > $@.tmp && mv -f $@.tmp $@ DISPLAY_X25519_C64_VO := $(filter src/Specific/X25519/C64/%,$(DISPLAY_NON_JAVA_VO)) -- cgit v1.2.3