Commit 452d7671 authored by lu_zero's avatar lu_zero

Make sure --as-needed and the other flags got checked as the last thing,...

Make sure --as-needed and the other flags got checked as the last thing, workarounds linking checks issues due broken system libraries

git-svn-id: file:///var/local/repositories/ffmpeg/trunk@6849 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent 102c5dd3
...@@ -459,6 +459,7 @@ ffserver="yes" ...@@ -459,6 +459,7 @@ ffserver="yes"
ffplay="yes" ffplay="yes"
LIBOBJFLAGS="" LIBOBJFLAGS=""
FFLDFLAGS=-Wl,--warn-common 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 FFSERVERLDFLAGS=-Wl,-E
LDCONFIG="ldconfig" LDCONFIG="ldconfig"
LIBPREF="lib" LIBPREF="lib"
...@@ -618,7 +619,7 @@ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)' ...@@ -618,7 +619,7 @@ SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME)-$(LIBMAJOR)$(SLIBSUF)'
SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a' SHFLAGS='-shared -Wl,--out-implib=lib$(NAME).dll.a'
;; ;;
Linux) Linux)
check_ldflags '-Wl,--as-needed' LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
;; ;;
IRIX*) IRIX*)
targetos=IRIX targetos=IRIX
...@@ -1520,7 +1521,7 @@ check_cflags -Wredundant-decls ...@@ -1520,7 +1521,7 @@ check_cflags -Wredundant-decls
check_cflags -Winline check_cflags -Winline
# add some linker flags # 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 # not all compilers support -Os
test "$optimize" = "small" && check_cflags -Os test "$optimize" = "small" && check_cflags -Os
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment