build: win: turn off build/installation of gnu Make

validsdp · Mar 6, 2018 · 951f80b · 951f80b
1 parent 7aa9b97
commit 951f80b
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 5 deletions.
diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh
@@ -1361,10 +1361,7 @@ list_files ocaml
 make_coq
 
 if [ "$INSTALLMAKE" == "Y" ] ; then
-  # I've to comment this out becase, with addons, if this make is in the
-  # PATH it hides the real one (the one that works, while this one does not)
-  #make_mingw_make
-  :
+  make_mingw_make
 fi
 
 list_files ocaml_coq

diff --git a/dev/ci/appveyor.bat b/dev/ci/appveyor.bat
@@ -23,7 +23,7 @@ if %USEOPAM% == false (
   call %APPVEYOR_BUILD_FOLDER%\dev\build\windows\MakeCoq_MinGW.bat -threads=1 ^
     -arch=%ARCH% -installer=Y -coqver=%APPVEYOR_BUILD_FOLDER_CFMT% ^
     -destcyg=%CYGROOT% -destcoq=%DESTCOQ% -cygcache=%CYGCACHE% ^
-    -addon=bignums ^
+    -addon=bignums -make=N ^
     -setup %CYGROOT%\%SETUP% || GOTO ErrorExit
   copy "%CYGROOT%\build\coq-local\dev\nsis\*.exe" dev\nsis || GOTO ErrorExit
   7z a coq-opensource-archive-windows-%ARCHLONG%.zip %CYGROOT%\build\tarballs\* || GOTO ErrorExit