aboutsummaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorLuca Barbato <lu_zero@gentoo.org>2006-10-31 15:09:36 +0000
committerLuca Barbato <lu_zero@gentoo.org>2006-10-31 15:09:36 +0000
commite240ee678cb534eadf61be98f3c08c61b34ea4ad (patch)
tree961c62b81bc370d40346776496a52824907ad9a1 /configure
parent9a64e0440eba6acb301e754328332d292c3c418d (diff)
downloadffmpeg-e240ee678cb534eadf61be98f3c08c61b34ea4ad.tar.gz
Make sure --as-needed and the other flags got checked as the last thing, workarounds linking checks issues due broken system libraries
Originally committed as revision 6849 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/configure b/configure
index d5bd7b4ee5..a55362b7e3 100755
--- a/configure
+++ b/configure
@@ -459,6 +459,7 @@ ffserver="yes"
ffplay="yes"
LIBOBJFLAGS=""
FFLDFLAGS=-Wl,--warn-common
+LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
FFSERVERLDFLAGS=-Wl,-E
LDCONFIG="ldconfig"
LIBPREF="lib"
@@ -618,7 +619,7 @@ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a'
;;
Linux)
-check_ldflags '-Wl,--as-needed'
+LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
;;
IRIX*)
targetos=IRIX
@@ -1520,7 +1521,7 @@ check_cflags -Wredundant-decls
check_cflags -Winline
# add some linker flags
-check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavformat' '-Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
+check_ldflags $LDLATEFLAGS
# not all compilers support -Os
test "$optimize" = "small" && check_cflags -Os