From 71adff776bb1f738a0e4344f03299dad23b21813 Mon Sep 17 00:00:00 2001 From: winlin Date: Mon, 17 Mar 2014 11:10:57 +0800 Subject: [PATCH] fix build script, remove unused build tool defines --- trunk/auto/depends.sh | 2 +- trunk/configure | 5 +---- 2 files changed, 2 insertions(+), 5 deletions(-) diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 5d2c08fe0..313bf4e6a 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -402,7 +402,7 @@ if [ $SRS_SSL = YES ]; then rm -rf ${SRS_OBJS}/openssl-1.0.1f && cd ${SRS_OBJS} && unzip -q ../3rdparty/openssl-1.0.1f.zip && cd openssl-1.0.1f && ./Configure --prefix=`pwd`/_release -no-shared no-asm linux-armv4 && - make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" KD=${SrsArmLD} LINK=${SrsArmLINK} RANDLIB=${SrsArmRANDLIB} && make install && + make CC=${SrsArmCC} GCC=${SrsArmGCC} AR="${SrsArmAR} r" LD=${SrsArmLD} LINK=${SrsArmGCC} RANDLIB=${SrsArmRANDLIB} && make install && cd .. && ln -sf openssl-1.0.1f/_release openssl && cd .. && touch ${SRS_OBJS}/_flag.ssl.arm.tmp ) diff --git a/trunk/configure b/trunk/configure index 3a92b828c..8aee1cec6 100755 --- a/trunk/configure +++ b/trunk/configure @@ -41,7 +41,6 @@ echo "#define SRS_BUILD_TS \"`date +%s`\"" >> $SRS_AUTO_HEADERS_H SrsArmCC="arm-linux-gnueabi-gcc" SrsArmGCC="arm-linux-gnueabi-gcc" SrsArmCXX="arm-linux-gnueabi-g++" -SrsArmLINK="arm-linux-gnueabi-g++" SrsArmAR="arm-linux-gnueabi-ar" SrsArmLD="arm-linux-gnueabi-ld" SrsArmRANDLIB="arm-linux-gnueabi-ranlib" @@ -274,11 +273,9 @@ if [ $SRS_GPERF = YES ]; then CXXFLAGS="${CXXFLAGS} -fno-builtin-malloc -fno-bui # arm or i386/x86_64 if [ $SRS_ARM_UBUNTU12 = YES ]; then cat << END > ${SRS_OBJS}/${SRS_MAKEFILE} -CC = ${SrsArmCC} -GCC = ${SrsArmGCC} CXX = ${SrsArmCXX} AR = ${SrsArmAR} -LINK = ${SrsArmLINK} +LINK = ${SrsArmCXX} END else cat << END > ${SRS_OBJS}/${SRS_MAKEFILE}