diff options
| author |  Enrico Tassi <Enrico.Tassi@inria.fr> | 2018-03-02 17:53:47 +0100 |
|---|---|---|
| committer | Enrico Tassi <Enrico.Tassi@inria.fr> | 2018-03-06 05:56:46 -0800 |
| commit | 951f80b0ce46976791d8b7fa7cf68aea11018da0 (patch) | |
| tree | eb34f3a180b65e9f64a01f45d0d273b75e41e173 /dev | |
| parent | 7aa9b97896c7277c9979d3149fe126793863026e (diff) | |
build: win: turn off build/installation of gnu Make
Diffstat (limited to 'dev')
| -rw-r--r-- | dev/build/windows/makecoq_mingw.sh | 5 | ||||
| -rw-r--r-- | dev/ci/appveyor.bat | 2 |
2 files changed, 2 insertions, 5 deletions
diff --git a/dev/build/windows/makecoq_mingw.sh b/dev/build/windows/makecoq_mingw.sh index b0801190e..49eece5a4 100644 --- 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 index 178121fd2..85a71baf7 100644 --- 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 |