diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index ca71172be..ca2fb034a 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -690,4 +690,4 @@ echo "" >> $SRS_AUTO_HEADERS_H ##################################################################################### # generated the test script ##################################################################################### -rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/srs.test objs/srs.test +rm -rf ${SRS_OBJS}/srs.test && ln -sf `pwd`/scripts/test_configure.sh objs/srs.test diff --git a/trunk/configure b/trunk/configure index 7bdb36eae..83ca6290f 100755 --- a/trunk/configure +++ b/trunk/configure @@ -428,7 +428,7 @@ if [ $SRS_SSL = YES ]; then if [ $SRS_USE_SYS_SSL = YES ]; then SrsLinkOptions=" # TODO: FIXME: remove static. if [ $SRS_STATIC = YES ]; then SrsLinkOptions="${SrsLinkOptions} -static"; fi # if mips, add -lgcc_eh, or stl compile failed. -if [ $SRS_MIPS_UBUNTU12 = NO ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh"; fi +if [ $SRS_MIPS_UBUNTU12 = YES ]; then SrsLinkOptions="${SrsLinkOptions} -lgcc_eh"; fi ##################################################################################### # Modules, compile each module, then link to binary diff --git a/trunk/research/librtmp/Makefile b/trunk/research/librtmp/Makefile index 230aba784..58b0455e2 100755 --- a/trunk/research/librtmp/Makefile +++ b/trunk/research/librtmp/Makefile @@ -41,10 +41,15 @@ SRS_RESEARCH_DEPS = Makefile srs_research_public.h # for x86/x64 platform ifeq ($(GCC), gcc) EXTRA_CXX_FLAG = -g -O0 -ldl -lstdc++ +endif # for arm. -else +ifeq ($(GCC), arm-linux-gnueabi-gcc) EXTRA_CXX_FLAG = -g -O0 -ldl -static -lstdc++ endif +# for mips, add -lgcc_eh, or stl compile failed. +ifeq ($(GCC), mipsel-openwrt-linux-gcc) + EXTRA_CXX_FLAG = -g -O0 -ldl -lstdc++ -lgcc_eh +endif srs_publish_nossl: srs_publish.c $(SRS_RESEARCH_DEPS) $(SRS_LIBRTMP_I) $(SRS_LIBRTMP_L) $(GCC) srs_publish.c $(SRS_LIBRTMP_L) $(EXTRA_CXX_FLAG) -o srs_publish_nossl