appveyor: Also build against newer OpenSSL versions
The original version is 1.0.2, which we keep as that version is not in use on other platforms anymore.
This commit is contained in:
@@ -22,6 +22,12 @@ install:
|
|||||||
- set MSYS_SH=C:\msys%BITS%\usr\bin\sh.exe
|
- set MSYS_SH=C:\msys%BITS%\usr\bin\sh.exe
|
||||||
- set MSYSTEM=MINGW%BITS%
|
- set MSYSTEM=MINGW%BITS%
|
||||||
- set TEST=win%BITS%
|
- set TEST=win%BITS%
|
||||||
|
- |
|
||||||
|
set IMG=%APPVEYOR_BUILD_WORKER_IMAGE:~-4%
|
||||||
|
set OPENSSL=OpenSSL
|
||||||
|
IF "%IMG%" == "2017" set OPENSSL=OpenSSL-v11
|
||||||
|
IF "%IMG%" == "2019" set OPENSSL=OpenSSL-v111
|
||||||
|
set OPENSSL_DIR=/c/%OPENSSL%-%TEST%
|
||||||
|
|
||||||
build_script:
|
build_script:
|
||||||
- '%MSYS_SH% --login -c ". /etc/profile && cd $APPVEYOR_BUILD_FOLDER && ./scripts/test.sh deps"'
|
- '%MSYS_SH% --login -c ". /etc/profile && cd $APPVEYOR_BUILD_FOLDER && ./scripts/test.sh deps"'
|
||||||
|
|||||||
+2
-2
@@ -184,8 +184,8 @@ win*)
|
|||||||
TARGET=
|
TARGET=
|
||||||
else
|
else
|
||||||
CONFIG="$CONFIG --enable-openssl"
|
CONFIG="$CONFIG --enable-openssl"
|
||||||
CFLAGS="$CFLAGS -I/c/OpenSSL-$TEST/include"
|
CFLAGS="$CFLAGS -I$OPENSSL_DIR/include"
|
||||||
LDFLAGS="-L/c/OpenSSL-$TEST"
|
LDFLAGS="-L$OPENSSL_DIR"
|
||||||
export LDFLAGS
|
export LDFLAGS
|
||||||
fi
|
fi
|
||||||
CFLAGS="$CFLAGS -mno-ms-bitfields"
|
CFLAGS="$CFLAGS -mno-ms-bitfields"
|
||||||
|
|||||||
Reference in New Issue
Block a user