Commit 8351d2ba authored by Diego Biurrun's avatar Diego Biurrun

Replace LDLATEFLAGS hackery by proper LDFLAGS tests.

The original reasons for LDLATEFLAGS are lost in the mists of time.

Originally committed as revision 14263 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 2615800a
...@@ -962,7 +962,6 @@ vhook="default" ...@@ -962,7 +962,6 @@ vhook="default"
# build settings # build settings
SHFLAGS='-shared -Wl,-soname,$$(@F)' SHFLAGS='-shared -Wl,-soname,$$(@F)'
VHOOKSHFLAGS='$(SHFLAGS)' VHOOKSHFLAGS='$(SHFLAGS)'
LDLATEFLAGS='-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
FFSERVERLDFLAGS=-Wl,-E FFSERVERLDFLAGS=-Wl,-E
LIBPREF="lib" LIBPREF="lib"
LIBSUF=".a" LIBSUF=".a"
...@@ -1293,7 +1292,6 @@ case $target_os in ...@@ -1293,7 +1292,6 @@ case $target_os in
EXESUF=".exe" EXESUF=".exe"
;; ;;
linux) linux)
LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS"
enable dv1394 enable dv1394
;; ;;
irix*) irix*)
...@@ -1831,7 +1829,8 @@ enabled extra_warnings && check_cflags -Winline ...@@ -1831,7 +1829,8 @@ enabled extra_warnings && check_cflags -Winline
# add some linker flags # add some linker flags
check_ldflags -Wl,--warn-common check_ldflags -Wl,--warn-common
check_ldflags $LDLATEFLAGS check_ldflags -Wl,--as-needed
check_ldflags '-Wl,-rpath-link,\$(BUILD_ROOT)/libpostproc -Wl,-rpath-link,\$(BUILD_ROOT)/libswscale -Wl,-rpath-link,\$(BUILD_ROOT)/libavfilter -Wl,-rpath-link,\$(BUILD_ROOT)/libavdevice -Wl,-rpath-link,\$(BUILD_ROOT)/libavformat -Wl,-rpath-link,\$(BUILD_ROOT)/libavcodec -Wl,-rpath-link,\$(BUILD_ROOT)/libavutil'
check_ldflags -Wl,-Bsymbolic check_ldflags -Wl,-Bsymbolic
if enabled small; then if enabled small; then
......
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