diff options
| author | James E. King III <jking@apache.org> | 2018-10-04 13:56:30 -0400 |
|---|---|---|
| committer | James E. King III <jking@apache.org> | 2018-10-04 15:42:23 -0400 |
| commit | 53f0859639856d0d65278845ebab00c4c9fba8e9 (patch) | |
| tree | 80441fa80f7bd48246ec84280641a3183837c753 /build/appveyor | |
| parent | 4a983069a63a6b0be0ae07e6dc4b0b23be44d93a (diff) | |
| download | thrift-53f0859639856d0d65278845ebab00c4c9fba8e9.tar.gz | |
fix appveyor mingw64 build
Diffstat (limited to 'build/appveyor')
| -rw-r--r-- | build/appveyor/MING-appveyor-build.bat | 1 | ||||
| -rw-r--r-- | build/appveyor/MING-appveyor-install.bat | 14 |
2 files changed, 3 insertions, 12 deletions
diff --git a/build/appveyor/MING-appveyor-build.bat b/build/appveyor/MING-appveyor-build.bat index 6ebdb906e..b37a95a79 100644 --- a/build/appveyor/MING-appveyor-build.bat +++ b/build/appveyor/MING-appveyor-build.bat @@ -26,6 +26,7 @@ SET CMAKEARGS=^ -DCMAKE_MAKE_PROGRAM=/mingw%NORM_PLATFORM%/bin/mingw32-make ^ -DCMAKE_C_COMPILER=/mingw%NORM_PLATFORM%/bin/gcc.exe ^ -DCMAKE_CXX_COMPILER=/mingw%NORM_PLATFORM%/bin/g++.exe ^ + -DOPENSSL_ROOT_DIR=/mingw%NORM_PLATFORM% ^ -DWITH_PYTHON=OFF ^ -DWITH_SHARED_LIB=OFF ^ -DWITH_STATIC_LIB=ON diff --git a/build/appveyor/MING-appveyor-install.bat b/build/appveyor/MING-appveyor-install.bat index ce8fc7d12..1069b058b 100644 --- a/build/appveyor/MING-appveyor-install.bat +++ b/build/appveyor/MING-appveyor-install.bat @@ -25,13 +25,9 @@ CALL cl_banner_install.bat || EXIT /B CALL cl_setenv.bat || EXIT /B CALL cl_showenv.bat || EXIT /B -:: We're going to keep boost at a version cmake understands -SET BOOSTVER=1.64.0-3 -SET BOOSTPKG=mingw-w64-%MINGWPLAT%-boost-%BOOSTVER%-any.pkg.tar.xz -SET IGNORE=--ignore mingw-w64-x86_64-boost --ignore mingw-w64-i686-boost - SET PACKAGES=^ --needed -S bison flex make ^ + mingw-w64-%MINGWPLAT%-boost ^ mingw-w64-%MINGWPLAT%-cmake ^ mingw-w64-%MINGWPLAT%-libevent ^ mingw-w64-%MINGWPLAT%-openssl ^ @@ -46,10 +42,4 @@ SET PACKAGES=^ :: Upgrade things %BASH% -lc "pacman --noconfirm -Syu %IGNORE%" || EXIT /B %BASH% -lc "pacman --noconfirm -Su %IGNORE%" || EXIT /B -%BASH% -lc "pacman --noconfirm %PACKAGES%" || EXIT /B - -:: Install a slightly older boost (BOOSTVER) as cmake in mingw -:: does not have built-in dependencies for boost 1.66.0 yet -:: -- this cuts down on build warning output -- - -%BASH% -lc "if [[ $(pacman --query | grep '%MINGWPLAT%-boost') ^!= *"%BOOSTVER%"* ]]; then wget http://repo.msys2.org/mingw/%MINGWPLAT%/%BOOSTPKG% && pacman --noconfirm --needed -U %BOOSTPKG% && rm %BOOSTPKG%; fi" || EXIT /B +%BASH% -lc "pacman --noconfirm %PACKAGES%" || EXIT /B
\ No newline at end of file |