From 421fbd4c3ec335589bab81f514d5535ec29491a3 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 17 Mar 2014 10:48:44 +0800 Subject: [PATCH] fix bug of arm build script__SRS_BUILD_NGINX=NO --- trunk/auto/depends.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 55966f279..055938101 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -217,7 +217,7 @@ if [ $SRS_ARM_UBUNTU12 = YES ]; then fi else # arm not specified, if exists flag, need to rebuild for no-arm platform. - if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st-1.9/obj/libst.a && -f ${SRS_OBJS}/st-1.9/obj/libst.so ]]; then + if [[ ! -f ${SRS_OBJS}/_flag.st.arm.tmp && -f ${SRS_OBJS}/st-1.9/obj/libst.a && -f ${SRS_OBJS}/st-1.9/obj/libst.so ]]; then echo "st-1.9t is ok."; else echo "build st-1.9t"; @@ -271,6 +271,7 @@ function write_nginx_html5() END } +__SRS_BUILD_NGINX=NO; if [ $SRS_ARM_UBUNTU12 = NO ]; then if [ $SRS_HLS = YES ]; then __SRS_BUILD_NGINX=YES; fi fi if [ $SRS_ARM_UBUNTU12 = NO ]; then if [ $SRS_HLS = YES ]; then if [[ -f ${SRS_OBJS}/nginx/sbin/nginx ]]; then