From a9d11df3a3defee4503212875426f2f1057ee18e Mon Sep 17 00:00:00 2001 From: winlin Date: Tue, 25 Mar 2014 14:36:30 +0800 Subject: [PATCH] update arm tool chain --- trunk/configure | 15 +++++++++------ trunk/src/main/srs_main_server.cpp | 3 +++ 2 files changed, 12 insertions(+), 6 deletions(-) diff --git a/trunk/configure b/trunk/configure index 12f11b668..4abe30c45 100755 --- a/trunk/configure +++ b/trunk/configure @@ -47,12 +47,15 @@ echo "" >> $SRS_AUTO_HEADERS_H # generate auto headers file, depends on the finished of options.sh ##################################################################################### # the arm-ubuntu12 options for make for depends -SrsArmCC="arm-linux-gnueabi-gcc" -SrsArmGCC="arm-linux-gnueabi-gcc" -SrsArmCXX="arm-linux-gnueabi-g++" -SrsArmAR="arm-linux-gnueabi-ar" -SrsArmLD="arm-linux-gnueabi-ld" -SrsArmRANDLIB="arm-linux-gnueabi-ranlib" +if [[ -z $SrsArmCC ]]; then SrsArmCC="arm-linux-gnueabi-gcc"; fi +if [[ -z $SrsArmGCC ]]; then SrsArmGCC="arm-linux-gnueabi-gcc"; fi +if [[ -z $SrsArmCXX ]]; then SrsArmCXX="arm-linux-gnueabi-g++"; fi +if [[ -z $SrsArmAR ]]; then SrsArmAR="arm-linux-gnueabi-ar"; fi +if [[ -z $SrsArmLD ]]; then SrsArmLD="arm-linux-gnueabi-ld"; fi +if [[ -z $SrsArmRANDLIB ]]; then SrsArmRANDLIB="arm-linux-gnueabi-ranlib"; fi +echo "cc=$SrsArmCC gcc=$SrsArmGCC g++=$SrsArmCXX ar=$SrsArmAR ld=$SrsArmLD randlib=$SrsArmRANDLIB" +echo "#define SRS_ARM_TOOL_CHAIN \"cc=$SrsArmCC gcc=$SrsArmGCC g++=$SrsArmCXX ar=$SrsArmAR ld=$SrsArmLD randlib=$SrsArmRANDLIB\"" >> $SRS_AUTO_HEADERS_H +echo "" >> $SRS_AUTO_HEADERS_H # apply user options. . auto/depends.sh diff --git a/trunk/src/main/srs_main_server.cpp b/trunk/src/main/srs_main_server.cpp index 860863bfd..e20fe131a 100644 --- a/trunk/src/main/srs_main_server.cpp +++ b/trunk/src/main/srs_main_server.cpp @@ -161,6 +161,9 @@ int main(int argc, char** argv) srs_trace("uname: "SRS_UNAME); srs_trace("build: %s, %s", SRS_BUILD_DATE, srs_is_little_endian()? "little-endian":"big-endian"); srs_trace("configure: "SRS_CONFIGURE); +#ifdef SRS_ARM_UBUNTU12 + srs_trace("arm tool chain: "SRS_ARM_TOOL_CHAIN); +#endif if ((ret = _srs_server->initialize()) != ERROR_SUCCESS) { return ret;