From 74fa3ba16fa36dd8827e3637b62f70cc72a37182 Mon Sep 17 00:00:00 2001 From: winlin Date: Fri, 13 Mar 2015 17:34:33 +0800 Subject: [PATCH] fix build failed for linux. --- trunk/auto/depends.sh | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 8aee3c73d..e5b9fca50 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -373,7 +373,7 @@ fi ##################################################################################### if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then # check the arm flag file, if flag changed, need to rebuild the st. - _ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_EPOLL" + _ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="EXTRA_CFLAGS=-DMD_HAVE_EPOLL" # for osx, use darwin for st, donot use epoll. if [ $OS_IS_OSX = YES ]; then _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="" @@ -392,8 +392,8 @@ if [ $SRS_EXPORT_LIBRTMP_PROJECT = NO ]; then rm -rf ${SRS_OBJS}/st-1.9 && cd ${SRS_OBJS} && unzip -q ../3rdparty/st-1.9.zip && cd st-1.9 && patch -p0 -R < ../../3rdparty/patches/1.st.arm.patch && - make CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} \ - EXTRA_CFLAGS=${_ST_EXTRA_CFLAGS} ${_ST_MAKE} && + make ${_ST_MAKE} CC=${SrsArmCC} AR=${SrsArmAR} LD=${SrsArmLD} RANDLIB=${SrsArmRANDLIB} \ + EXTRA_CFLAGS=${_ST_EXTRA_CFLAGS} && cd .. && rm -rf st && ln -sf st-1.9/obj st && cd .. && touch ${SRS_OBJS}/_flag.st.arm.tmp )