diff options
| author | Edward Thomson <ethomson@github.com> | 2017-02-25 12:45:14 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-02-25 12:45:14 +0000 |
| commit | 7143145f2fcb0f7476f333f9df990b8a06cd52c0 (patch) | |
| tree | 8a20aa2bb77904e474ad028fe28e6c3bbd141c00 | |
| parent | 7f875fb4f68e3d6d5de0809785a582466c5de86e (diff) | |
| parent | 408a7b7737fd560f5a49bf977287b195ead5c885 (diff) | |
| download | libgit2-7143145f2fcb0f7476f333f9df990b8a06cd52c0.tar.gz | |
Merge pull request #4137 from libgit2/ethomson/appveyor
appveyor: don't rewrite the system mingw
| -rw-r--r-- | appveyor.yml | 1 | ||||
| -rwxr-xr-x | script/appveyor-mingw.sh | 6 |
2 files changed, 5 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml index 9e94c0726..fb3fff7dd 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -2,6 +2,7 @@ version: '{build}' branches: only: - master + - appveyor - /^maint.*/ environment: GITTEST_INVASIVE_FS_STRUCTURE: 1 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 |