Commit 6025c5fb authored by mru's avatar mru

Revert r11202: do not create copy relocations when linking to shared libs

This caused more problems than it solved and is no longer required.


git-svn-id: file:///var/local/repositories/ffmpeg/trunk@11210 9553f0bf-9b14-0410-a0b8-cfaf0461ba5b
parent b1c77a83
...@@ -1737,7 +1737,6 @@ enabled extra_warnings && check_cflags -Winline ...@@ -1737,7 +1737,6 @@ enabled extra_warnings && check_cflags -Winline
check_ldflags -Wl,--warn-common check_ldflags -Wl,--warn-common
check_ldflags $LDLATEFLAGS check_ldflags $LDLATEFLAGS
check_ldflags -Wl,-Bsymbolic check_ldflags -Wl,-Bsymbolic
check_ldflags -Wl,-z,nocopyreloc
if enabled small; then if enabled small; then
check_cflags -Os # not all compilers support -Os check_cflags -Os # not all compilers support -Os
...@@ -1753,9 +1752,12 @@ fi ...@@ -1753,9 +1752,12 @@ fi
# PIC flags for shared library objects where they are needed # PIC flags for shared library objects where they are needed
if enabled shared; then if enabled shared; then
case "$arch" in # LIBOBJFLAGS may have already been set in the OS configuration
x86_64|ia64|alpha|sparc*|power*) add_cflags '\$(PIC)' ;; if test -z "$LIBOBJFLAGS" ; then
esac case "$arch" in
x86_64|ia64|alpha|sparc*|power*) LIBOBJFLAGS='$(PIC)' ;;
esac
fi
fi fi
if enabled gprof; then if enabled gprof; 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