提交 88b6f0fa 编写于 作者: D Diego Biurrun

Fix --extra-ldflags when cross-compiling for MinGW.

Originally committed as revision 5818 to svn://svn.ffmpeg.org/ffmpeg/trunk
上级 c536cb09
...@@ -709,7 +709,7 @@ for opt do ...@@ -709,7 +709,7 @@ for opt do
;; ;;
--extra-cflags=*) CFLAGS="$CFLAGS $optval" --extra-cflags=*) CFLAGS="$CFLAGS $optval"
;; ;;
--extra-ldflags=*) FFLDFLAGS="$FFLDFLAGS $optval" --extra-ldflags=*) EXTRALDFLAGS="$optval"
;; ;;
--extra-libs=*) extralibs="$optval" --extra-libs=*) extralibs="$optval"
;; ;;
...@@ -893,7 +893,6 @@ EOF ...@@ -893,7 +893,6 @@ EOF
if test "$mingwce" = "yes"; then if test "$mingwce" = "yes"; then
protocols="no" protocols="no"
fi fi
#FIXME: This ignores --extra-ldflags.
FFLDFLAGS='-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)' FFLDFLAGS='-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)'
SLIBPREF="" SLIBPREF=""
SLIBSUF=".dll" SLIBSUF=".dll"
...@@ -902,8 +901,8 @@ EOF ...@@ -902,8 +901,8 @@ EOF
if test "$force_libdir" != yes; then bindir="$PREFIX"; fi if test "$force_libdir" != yes; then bindir="$PREFIX"; fi
fi fi
# Combine FFLDFLAGS and the LDFLAGS environment variable # Combine FFLDFLAGS, EXTRALDFLAGS and the LDFLAGS environment variable.
LDFLAGS="$FFLDFLAGS $LDFLAGS" LDFLAGS="$FFLDFLAGS $EXTRALDFLAGS $LDFLAGS"
test -n "$cross_prefix" && cross_compile=yes test -n "$cross_prefix" && cross_compile=yes
cc="${cross_prefix}${cc}" cc="${cross_prefix}${cc}"
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册