mirror of https://git.ffmpeg.org/ffmpeg.git
Revert r11202: do not create copy relocations when linking to shared libs
This caused more problems than it solved and is no longer required. Originally committed as revision 11210 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
parent
a309073bf4
commit
569cb218f8
|
@ -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,10 +1752,13 @@ 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
|
||||||
|
# LIBOBJFLAGS may have already been set in the OS configuration
|
||||||
|
if test -z "$LIBOBJFLAGS" ; then
|
||||||
case "$arch" in
|
case "$arch" in
|
||||||
x86_64|ia64|alpha|sparc*|power*) add_cflags '\$(PIC)' ;;
|
x86_64|ia64|alpha|sparc*|power*) LIBOBJFLAGS='$(PIC)' ;;
|
||||||
esac
|
esac
|
||||||
fi
|
fi
|
||||||
|
fi
|
||||||
|
|
||||||
if enabled gprof; then
|
if enabled gprof; then
|
||||||
add_cflags "-p"
|
add_cflags "-p"
|
||||||
|
|
Loading…
Reference in New Issue