external/srs
1
0
Fork 0
mirror of https://github.com/ossrs/srs.git synced 2025-03-09 15:49:59 +00:00
Code Issues Releases Wiki Activity

fix build script, remove unused build tool defines

Browse source
This commit is contained in:
winlin 2014-03-17 11:10:57 +08:00
parent 77e652fcbe
commit 71adff776b
2 changed files with 2 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
trunk/auto/depends.sh
View file

@ -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
)

5
trunk/configure vendored
View file

@ -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}