mirror of https://git.ffmpeg.org/ffmpeg.git
configure: Use enable_weak when enabling pic
This allows it to be overridden, either by the user on the command line, or by other sections of the configure script. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
parent
94235f2ba2
commit
b1803c79dc
|
@ -2958,7 +2958,7 @@ case "$arch" in
|
|||
esac
|
||||
|
||||
enable $subarch
|
||||
enabled spic && enable pic
|
||||
enabled spic && enable_weak pic
|
||||
|
||||
# OS specific
|
||||
case $target_os in
|
||||
|
@ -3217,7 +3217,7 @@ esc(){
|
|||
|
||||
echo "config:$arch:$subarch:$cpu:$target_os:$(esc $cc_ident):$(esc $LIBAV_CONFIGURATION)" >config.fate
|
||||
|
||||
check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable pic
|
||||
check_cpp_condition stdlib.h "defined(__PIC__) || defined(__pic__) || defined(PIC)" && enable_weak pic
|
||||
|
||||
set_default $PATHS_LIST
|
||||
set_default nm
|
||||
|
@ -3256,14 +3256,15 @@ enabled version3 && { enabled gpl && enable gplv3 || enable lgplv3; }
|
|||
|
||||
disabled optimizations || check_cflags -fomit-frame-pointer
|
||||
|
||||
enable_pic() {
|
||||
enable_weak_pic() {
|
||||
disabled pic && return
|
||||
enable pic
|
||||
add_cppflags -DPIC
|
||||
add_cflags -fPIC
|
||||
add_asflags -fPIC
|
||||
}
|
||||
|
||||
enabled pic && enable_pic
|
||||
enabled pic && enable_weak_pic
|
||||
|
||||
check_cc <<EOF || die "Symbol mangling check failed."
|
||||
int ff_extern;
|
||||
|
@ -3332,7 +3333,7 @@ EOF
|
|||
check_inline_asm asm_mod_q '"add r0, %Q0, %R0" :: "r"((long long)0)'
|
||||
check_inline_asm asm_mod_y '"vmul.i32 d0, d0, %y0" :: "x"(0)'
|
||||
|
||||
enabled_all armv6t2 shared !pic && enable_pic
|
||||
enabled_all armv6t2 shared !pic && enable_weak_pic
|
||||
|
||||
elif enabled mips; then
|
||||
|
||||
|
|
Loading…
Reference in New Issue