diff --git a/trunk/auto/depends.sh b/trunk/auto/depends.sh index 542000567..a8349ce8e 100755 --- a/trunk/auto/depends.sh +++ b/trunk/auto/depends.sh @@ -376,13 +376,13 @@ fi # state-threads ##################################################################################### # check the cross build flag file, if flag changed, need to rebuild the st. -_ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="-O0" && _ST_LD=${SRS_TOOL_LD} && _ST_OBJ="LINUX_`uname -r`_DBG" +_ST_MAKE=linux-debug && _ST_EXTRA_CFLAGS="-O0" && _ST_OBJ="LINUX_`uname -r`_DBG" if [[ $SRS_VALGRIND == YES ]]; then _ST_EXTRA_CFLAGS="$_ST_EXTRA_CFLAGS -DMD_VALGRIND" fi # for osx, use darwin for st, donot use epoll. if [[ $SRS_OSX == YES ]]; then - _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_KQUEUE" && _ST_LD=${SRS_TOOL_CC} && _ST_OBJ="DARWIN_`uname -r`_DBG" + _ST_MAKE=darwin-debug && _ST_EXTRA_CFLAGS="-DMD_HAVE_KQUEUE" && _ST_OBJ="DARWIN_`uname -r`_DBG" fi # Whether enable debug stats. if [[ $SRS_DEBUG_STATS == YES ]]; then @@ -417,7 +417,7 @@ else done && # Build source code. make ${_ST_MAKE} EXTRA_CFLAGS="${_ST_EXTRA_CFLAGS}" \ - CC=${SRS_TOOL_CC} AR=${SRS_TOOL_AR} LD=${_ST_LD} RANDLIB=${SRS_TOOL_RANDLIB} && + CC=${SRS_TOOL_CC} AR=${SRS_TOOL_AR} LD=${SRS_TOOL_LD} RANDLIB=${SRS_TOOL_RANDLIB} && cd .. && rm -rf st && ln -sf st-srs/${_ST_OBJ} st ) fi diff --git a/trunk/auto/options.sh b/trunk/auto/options.sh index a2d5aa427..0be16ca6f 100755 --- a/trunk/auto/options.sh +++ b/trunk/auto/options.sh @@ -398,6 +398,10 @@ function apply_auto_options() { echo "For cross build, host: $SRS_CROSS_BUILD_HOST, prefix: $SRS_CROSS_BUILD_PREFIX, armv7: $SRS_CROSS_BUILD_ARMV7, aarch64: $SRS_CROSS_BUILD_AARCH64" fi + if [[ $SRS_OSX == YES ]]; then + SRS_TOOL_LD=$SRS_TOOL_CC + fi + # The SRT code in SRS requires c++11, although we build libsrt without c++11. # TODO: FIXME: Remove c++11 code in SRT of SRS. if [[ $SRS_SRT == YES ]]; then