summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEdward Thomson <ethomson@github.com>2017-02-24 17:37:00 +0000
committerEdward Thomson <ethomson@github.com>2017-02-24 20:25:45 +0000
commit408a7b7737fd560f5a49bf977287b195ead5c885 (patch)
tree8a20aa2bb77904e474ad028fe28e6c3bbd141c00
parentc3abb1d261ca182f0ead70d64778fa1e13c0794d (diff)
downloadlibgit2-ethomson/appveyor.tar.gz
appveyor: don't rewrite system mingwethomson/appveyor
Download mingw-w64 into our build directory and execute it there, don't try to overwrite the system's mingw.
-rwxr-xr-xscript/appveyor-mingw.sh6
1 files changed, 4 insertions, 2 deletions
diff --git a/script/appveyor-mingw.sh b/script/appveyor-mingw.sh
index 198801875..d171a72d5 100755
--- a/script/appveyor-mingw.sh
+++ b/script/appveyor-mingw.sh
@@ -7,15 +7,17 @@ if [ "$ARCH" = "i686" ]; then
curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win32/Personal%20Builds/mingw-builds/4.9.2/threads-win32/sjlj/$f
fi
7z x $f > /dev/null
- mv mingw32 /MinGW
+ export PATH=`pwd`/mingw32/bin:$PATH
else
f=x86_64-4.9.2-release-win32-seh-rt_v3-rev1.7z
if ! [ -e $f ]; then
curl -LsSO http://sourceforge.net/projects/mingw-w64/files/Toolchains%20targetting%20Win64/Personal%20Builds/mingw-builds/4.9.2/threads-win32/seh/$f
fi
7z x $f > /dev/null
- mv mingw64 /MinGW
+ export PATH=`pwd`/mingw64/bin:$PATH
fi
cd build
+gcc --version
+cmake --version
cmake -D ENABLE_TRACE=ON -D BUILD_CLAR=ON .. -G"$GENERATOR"
cmake --build . --config RelWithDebInfo