Skip to content

Commit f0e75b9

Browse files
fix bug of last commit
1 parent 0d668c6 commit f0e75b9

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

trunk/auto/apps.sh

+2-1
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
# $APP_NAME the app name to output. ie. srs
1111
# $MODULE_OBJS array, the objects to compile the app.
1212
# $ModuleLibFiles array, the 3rdpart library file to link with. ie. [objs/st-1.9/obj/libst.a objs/libx264/obj/libx264.a]
13+
# $LINK_OPTIONS the linker options. ie. -ldl
1314

1415
FILE=${SRS_OBJS}/Makefile
1516

@@ -88,7 +89,7 @@ for item in ${ModuleLibFiles[*]}; do
8889
echo -n "$item " >> ${FILE}
8990
done
9091
# link options.
91-
echo -n "${LDFLAGS}" >> ${FILE}
92+
echo -n "${LINK_OPTIONS}" >> ${FILE}
9293
echo "" >> ${FILE}
9394
echo "" >> ${FILE}
9495

trunk/configure

+2-2
Original file line numberDiff line numberDiff line change
@@ -420,7 +420,7 @@ if [[ $SRS_SRT == YES ]]; then
420420
ModuleLibIncs+=(${LibSRTRoot})
421421
MODULE_OBJS="${MODULE_OBJS} ${SRT_OBJS[@]}"
422422
fi
423-
LDFLAGS="${LDFLAGS} ${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}"
423+
LINK_OPTIONS="${LDFLAGS} ${SrsLinkOptions}${SrsGprofLink}${SrsGperfLink}"
424424
#
425425
# srs: srs(simple rtmp server) over st(state-threads)
426426
BUILD_KEY="srs" APP_MAIN="srs_main_server" APP_NAME="srs" . $SRS_WORKDIR/auto/apps.sh
@@ -484,7 +484,7 @@ if [[ $SRS_UTEST == YES ]]; then
484484
fi
485485
MODULE_DEPENDS=("CORE" "KERNEL" "PROTOCOL" "APP")
486486
MODULE_OBJS="${CORE_OBJS[@]} ${KERNEL_OBJS[@]} ${PROTOCOL_OBJS[@]} ${APP_OBJS[@]} ${SRT_OBJS[@]}"
487-
LDFLAGS="${LDFLAGS} -lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . $SRS_WORKDIR/auto/utest.sh
487+
LINK_OPTIONS="${LDFLAGS} -lpthread ${SrsLinkOptions}" MODULE_DIR="src/utest" APP_NAME="srs_utest" . $SRS_WORKDIR/auto/utest.sh
488488
fi
489489

490490
#####################################################################################

0 commit comments

Comments
 (0)