mirror of https://git.ffmpeg.org/ffmpeg.git
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
This commit is contained in:
parent
9a64e0440e
commit
e240ee678c
|
@ -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)'
|
||||||
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
|
||||||
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
|
||||||
|
|
Loading…
Reference in New Issue