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>
12 years ago · 1603c9bd9c
parent 0f88a98b43 2aa3325454
commit 1603c9bd9c
1 changed files with 1 additions and 1 deletions
--- a/2
+++ b/2
@ -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