Commit 5755bc88 authored by Reimar Döffinger's avatar Reimar Döffinger

Check if PIC is somehow already enabled (e.g. a compiler that enables it by default).

This in particular ensures that -DPIC is set appropriately for YASM, which avoids
linking failures on x86_64 for compilers that have PIE enabled by default
(e.g. hardened Gentoo).
It also makes the macho64 special-case hack adding -DPIC to YASMFLAGS obsolete.

Originally committed as revision 20497 to svn://svn.ffmpeg.org/ffmpeg/trunk
parent 00fa73f0
......@@ -1876,6 +1876,9 @@ esac
enable $arch $subarch
enabled spic && enable pic
# This is the same check as used in libavutil/internal.h
# to enable RIP-relative addressing for x86_64 inline asm.
check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
# OS specific
case $target_os in
......@@ -2237,7 +2240,6 @@ EOF
test -n "$extern_prefix" && append YASMFLAGS "-DPREFIX"
case "$objformat" in
elf) enabled debug && append YASMFLAGS "-g dwarf2" ;;
macho64) append YASMFLAGS "-DPIC" ;;
esac
disabled yasm || { check_yasm "pabsw xmm0, xmm0" && enable yasm; }
......
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