winlin

update arm tool chain

@@ -47,12 +47,15 @@ echo "" >> $SRS_AUTO_HEADERS_H @@ -47,12 +47,15 @@ echo "" >> $SRS_AUTO_HEADERS_H
47 # generate auto headers file, depends on the finished of options.sh 47 # generate auto headers file, depends on the finished of options.sh
48 ##################################################################################### 48 #####################################################################################
49 # the arm-ubuntu12 options for make for depends 49 # the arm-ubuntu12 options for make for depends
50 -SrsArmCC="arm-linux-gnueabi-gcc"  
51 -SrsArmGCC="arm-linux-gnueabi-gcc"  
52 -SrsArmCXX="arm-linux-gnueabi-g++"  
53 -SrsArmAR="arm-linux-gnueabi-ar"  
54 -SrsArmLD="arm-linux-gnueabi-ld"  
55 -SrsArmRANDLIB="arm-linux-gnueabi-ranlib" 50 +if [[ -z $SrsArmCC ]]; then SrsArmCC="arm-linux-gnueabi-gcc"; fi
  51 +if [[ -z $SrsArmGCC ]]; then SrsArmGCC="arm-linux-gnueabi-gcc"; fi
  52 +if [[ -z $SrsArmCXX ]]; then SrsArmCXX="arm-linux-gnueabi-g++"; fi
  53 +if [[ -z $SrsArmAR ]]; then SrsArmAR="arm-linux-gnueabi-ar"; fi
  54 +if [[ -z $SrsArmLD ]]; then SrsArmLD="arm-linux-gnueabi-ld"; fi
  55 +if [[ -z $SrsArmRANDLIB ]]; then SrsArmRANDLIB="arm-linux-gnueabi-ranlib"; fi
  56 +echo "cc=$SrsArmCC gcc=$SrsArmGCC g++=$SrsArmCXX ar=$SrsArmAR ld=$SrsArmLD randlib=$SrsArmRANDLIB"
  57 +echo "#define SRS_ARM_TOOL_CHAIN \"cc=$SrsArmCC gcc=$SrsArmGCC g++=$SrsArmCXX ar=$SrsArmAR ld=$SrsArmLD randlib=$SrsArmRANDLIB\"" >> $SRS_AUTO_HEADERS_H
  58 +echo "" >> $SRS_AUTO_HEADERS_H
56 59
57 # apply user options. 60 # apply user options.
58 . auto/depends.sh 61 . auto/depends.sh
@@ -161,6 +161,9 @@ int main(int argc, char** argv) @@ -161,6 +161,9 @@ int main(int argc, char** argv)
161 srs_trace("uname: "SRS_UNAME); 161 srs_trace("uname: "SRS_UNAME);
162 srs_trace("build: %s, %s", SRS_BUILD_DATE, srs_is_little_endian()? "little-endian":"big-endian"); 162 srs_trace("build: %s, %s", SRS_BUILD_DATE, srs_is_little_endian()? "little-endian":"big-endian");
163 srs_trace("configure: "SRS_CONFIGURE); 163 srs_trace("configure: "SRS_CONFIGURE);
  164 +#ifdef SRS_ARM_UBUNTU12
  165 + srs_trace("arm tool chain: "SRS_ARM_TOOL_CHAIN);
  166 +#endif
164 167
165 if ((ret = _srs_server->initialize()) != ERROR_SUCCESS) { 168 if ((ret = _srs_server->initialize()) != ERROR_SUCCESS) {
166 return ret; 169 return ret;