winlin

fix build script, remove unused build tool defines

@@ -402,7 +402,7 @@ if [ $SRS_SSL = YES ]; then @@ -402,7 +402,7 @@ if [ $SRS_SSL = YES ]; then
402 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && 402 rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} &&
403 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && 403 unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f &&
404 ./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 && 404 ./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 &&
405 - make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" KD=${SrsArmLD} LINK=${SrsArmLINK} RANDLIB=${SrsArmRANDLIB} && make install && 405 + make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && make install &&
406 cd .. && ln -sf openssl-1.0.1f/_release openssl && 406 cd .. && ln -sf openssl-1.0.1f/_release openssl &&
407 cd .. && touch ${SRS_OBJS}/_flag.ssl.arm.tmp 407 cd .. && touch ${SRS_OBJS}/_flag.ssl.arm.tmp
408 ) 408 )
@@ -41,7 +41,6 @@ echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H @@ -41,7 +41,6 @@ echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H
41 SrsArmCC="arm-linux-gnueabi-gcc" 41 SrsArmCC="arm-linux-gnueabi-gcc"
42 SrsArmGCC="arm-linux-gnueabi-gcc" 42 SrsArmGCC="arm-linux-gnueabi-gcc"
43 SrsArmCXX="arm-linux-gnueabi-g++" 43 SrsArmCXX="arm-linux-gnueabi-g++"
44 -SrsArmLINK="arm-linux-gnueabi-g++"  
45 SrsArmAR="arm-linux-gnueabi-ar" 44 SrsArmAR="arm-linux-gnueabi-ar"
46 SrsArmLD="arm-linux-gnueabi-ld" 45 SrsArmLD="arm-linux-gnueabi-ld"
47 SrsArmRANDLIB="arm-linux-gnueabi-ranlib" 46 SrsArmRANDLIB="arm-linux-gnueabi-ranlib"
@@ -274,11 +273,9 @@ if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-bui @@ -274,11 +273,9 @@ if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-bui
274 # arm or i386/x86_64 273 # arm or i386/x86_64
275 if [ $SRS_ARM_UBUNTU12 = YES ]; then 274 if [ $SRS_ARM_UBUNTU12 = YES ]; then
276 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} 275 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}
277 -CC = ${SrsArmCC}  
278 -GCC = ${SrsArmGCC}  
279 CXX = ${SrsArmCXX} 276 CXX = ${SrsArmCXX}
280 AR = ${SrsArmAR} 277 AR = ${SrsArmAR}
281 -LINK = ${SrsArmLINK} 278 +LINK = ${SrsArmCXX}
282 END 279 END
283 else 280 else
284 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} 281 cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}