From 84cdfdf1871997931a866949b6c14198e01a3136 Mon Sep 17 00:00:00 2001
From: Jim
Date: Fri, 1 Dec 2017 10:24:57 -0800
Subject: For bug 6249, Segmentation fault when building Coq on Windows 10.

Enable builds on Windows by removing Windows-style endings where it impacts make.

The fix in Makefile.build is a band-aid fix; maximedenes said he would remove the dependency on sed and awk here.
---
 Makefile.build   | 2 +-
 Makefile.checker | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/Makefile.build b/Makefile.build
index 39b793d2bb..867c494a1c 100644
--- a/Makefile.build
+++ b/Makefile.build
@@ -302,7 +302,7 @@ kernel/byterun/coq_jumptbl.h : kernel/byterun/coq_instruct.h
                -e '/^}/q' $< $(TOTARGET)
 
 kernel/copcodes.ml: kernel/byterun/coq_instruct.h
-	sed -n -e '/^enum/p' -e 's/,//g' -e '/^  /p' $< | \
+	tr -d "\r" < $< | sed -n -e '/^enum/p' -e 's/,//g' -e '/^  /p' | \
 	awk -f kernel/make-opcodes $(TOTARGET)
 
 %.o: %.c
diff --git a/Makefile.checker b/Makefile.checker
index 435d8e8f64..f9ed2d9571 100644
--- a/Makefile.checker
+++ b/Makefile.checker
@@ -75,8 +75,9 @@ checker/%.cmx: checker/%.ml
 
 md5chk:
 	$(SHOW)'MD5SUM cic.mli'
-	$(HIDE)if grep -q `$(MD5SUM) checker/cic.mli` checker/values.ml; \
-	       then true; else echo "Error: outdated checker/values.ml"; false; fi
+	$(HIDE)v=`tr -d "\r" < checker/cic.mli | $(MD5SUM) | sed -n -e 's/ .*//' -e '/^/p'`; \
+	       if grep -q "$$v" checker/values.ml; \
+	       then true; else echo "Error: outdated checker/values.ml: $$v" >&2; false; fi
 
 .PHONY: md5chk
 
-- 
cgit v1.2.3


From ffb7ada29308398746decc538c81b608ca57f88c Mon Sep 17 00:00:00 2001
From: Jim
Date: Fri, 1 Dec 2017 19:56:34 -0800
Subject: Fix build file

---
 dev/build/windows/MakeCoq_MinGW.bat | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/dev/build/windows/MakeCoq_MinGW.bat b/dev/build/windows/MakeCoq_MinGW.bat
index f91b301b8c..665d541761 100644
--- a/dev/build/windows/MakeCoq_MinGW.bat
+++ b/dev/build/windows/MakeCoq_MinGW.bat
@@ -345,7 +345,7 @@ IF "%COQREGTESTING%" == "Y" (
 SET "EXTRAPACKAGES= "
 
 IF NOT "%APPVEYOR%" == "True" (
-  SET EXTRAPACKAGES="-P wget,curl,git,gcc-core,gcc-g++,automake1.5"
+  SET EXTRAPACKAGES=-P wget,curl,git,gcc-core,gcc-g++,automake1.5
 )
 
 IF "%RUNSETUP%"=="Y" (
-- 
cgit v1.2.3