Merge branch '4.0release' into develop
This commit is contained in:
commit
62909bb2d0
|
|
@ -509,7 +509,7 @@ if [[ $SRS_SSL == YES && $SRS_USE_SYS_SSL != YES ]]; then
|
||||||
fi
|
fi
|
||||||
# cross build not specified, if exists flag, need to rebuild for no-arm platform.
|
# cross build not specified, if exists flag, need to rebuild for no-arm platform.
|
||||||
if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then
|
if [[ -f ${SRS_OBJS}/${SRS_PLATFORM}/openssl/lib/libssl.a ]]; then
|
||||||
echo "Openssl-1.1.0e is ok.";
|
echo "The $OPENSSL_CANDIDATE is ok.";
|
||||||
else
|
else
|
||||||
echo "Building $OPENSSL_CANDIDATE.";
|
echo "Building $OPENSSL_CANDIDATE.";
|
||||||
(
|
(
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue
Block a user