From 88b6f0faf87c70398033ff612d70b97979828c14 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Mon, 24 Jul 2006 00:58:20 +0000 Subject: [PATCH] Fix --extra-ldflags when cross-compiling for MinGW. Originally committed as revision 5818 to svn://svn.ffmpeg.org/ffmpeg/trunk --- configure | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/configure b/configure index d051f56255..ad8b8b0b75 100755 --- a/configure +++ b/configure @@ -709,7 +709,7 @@ for opt do ;; --extra-cflags=*) CFLAGS="$CFLAGS $optval" ;; - --extra-ldflags=*) FFLDFLAGS="$FFLDFLAGS $optval" + --extra-ldflags=*) EXTRALDFLAGS="$optval" ;; --extra-libs=*) extralibs="$optval" ;; @@ -893,7 +893,6 @@ EOF if test "$mingwce" = "yes"; then protocols="no" fi - #FIXME: This ignores --extra-ldflags. FFLDFLAGS='-Wl,--output-def,$(@:.dll=.def),--out-implib,lib$(SLIBNAME:$(SLIBSUF)=.dll.a)' SLIBPREF="" SLIBSUF=".dll" @@ -902,8 +901,8 @@ EOF if test "$force_libdir" != yes; then bindir="$PREFIX"; fi fi -# Combine FFLDFLAGS and the LDFLAGS environment variable -LDFLAGS="$FFLDFLAGS $LDFLAGS" +# Combine FFLDFLAGS, EXTRALDFLAGS and the LDFLAGS environment variable. +LDFLAGS="$FFLDFLAGS $EXTRALDFLAGS $LDFLAGS" test -n "$cross_prefix" && cross_compile=yes cc="${cross_prefix}${cc}"