mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-11-21 10:55:51 +02:00
Merge commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a'
* commit '40d5df67d2c4e1f0dd1e902435567eb5edad6a9a': configure: Add a comment about why we don't try to enable pic on arm on target_os=win32 Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
1338cc1ac2
1
configure
vendored
1
configure
vendored
@ -5481,6 +5481,7 @@ EOF
|
|||||||
.object_arch armv4
|
.object_arch armv4
|
||||||
EOF
|
EOF
|
||||||
|
|
||||||
|
# MS armasm fails to assemble our PIC constructs
|
||||||
[ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic
|
[ $target_os != win32 ] && enabled_all armv6t2 shared !pic && enable_weak_pic
|
||||||
|
|
||||||
elif enabled mips; then
|
elif enabled mips; then
|
||||||
|
Loading…
Reference in New Issue
Block a user