diff options
| author | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 08:27:50 +0200 |
|---|---|---|
| committer | Michael Niedermayer <michaelni@gmx.at> | 2013-06-11 08:28:00 +0200 |
| commit | 1603c9bd9caf5b3843fa00d5e1a62fc0480065c0 (patch) | |
| tree | 2a511d8e4d80e8cbf643a5ee6c246c6ceac3f7de | |
| parent | 0f88a98b43b8ae41529a15c52b35b5d1bbef3197 (diff) | |
| parent | 2aa3325454545b63cd63e3d5884f8558790d51df (diff) | |
| download | ffmpeg-1603c9bd9caf5b3843fa00d5e1a62fc0480065c0.tar.gz | |
Merge commit '2aa3325454545b63cd63e3d5884f8558790d51df'
* commit '2aa3325454545b63cd63e3d5884f8558790d51df':
configure: arm: Don't try to enable pic for shared libraries on win32
Merged-by: Michael Niedermayer <michaelni@gmx.at>
| -rwxr-xr-x | configure | 2 |
1 files changed, 1 insertions, 1 deletions
@@ -3795,7 +3795,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_weak_pic + [ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic elif enabled mips; then |