aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2006-07-24 00:58:20 +0000
committerDiego Biurrun <diego@biurrun.de>2006-07-24 00:58:20 +0000
commit88b6f0faf87c70398033ff612d70b97979828c14 (patch)
tree57dfd0e40a220ad48e3888f4f44b6f67e5a12334 /configure
parentc536cb09f9c6f2d23b98997656c67df09e6b7a79 (diff)
downloadffmpeg-88b6f0faf87c70398033ff612d70b97979828c14.tar.gz
Fix --extra-ldflags when cross-compiling for MinGW.
Originally committed as revision 5818 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files 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}"