Originally committed as revision 14263 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diego Biurrun authored on 2008/07/18 01:28:48... | ... |
@@ -962,7 +962,6 @@ vhook="default" |
962 | 962 |
# build settings |
963 | 963 |
SHFLAGS='-shared -Wl,-soname,$$(@F)' |
964 | 964 |
VHOOKSHFLAGS='$(SHFLAGS)' |
965 |
-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' |
|
966 | 965 |
FFSERVERLDFLAGS=-Wl,-E |
967 | 966 |
LIBPREF="lib" |
968 | 967 |
LIBSUF=".a" |
... | ... |
@@ -1293,7 +1292,6 @@ case $target_os in |
1293 | 1293 |
EXESUF=".exe" |
1294 | 1294 |
;; |
1295 | 1295 |
linux) |
1296 |
- LDLATEFLAGS="-Wl,--as-needed $LDLATEFLAGS" |
|
1297 | 1296 |
enable dv1394 |
1298 | 1297 |
;; |
1299 | 1298 |
irix*) |
... | ... |
@@ -1831,7 +1829,8 @@ enabled extra_warnings && check_cflags -Winline |
1831 | 1831 |
|
1832 | 1832 |
# add some linker flags |
1833 | 1833 |
check_ldflags -Wl,--warn-common |
1834 |
-check_ldflags $LDLATEFLAGS |
|
1834 |
+check_ldflags -Wl,--as-needed |
|
1835 |
+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' |
|
1835 | 1836 |
check_ldflags -Wl,-Bsymbolic |
1836 | 1837 |
|
1837 | 1838 |
if enabled small; then |