You've already forked FFmpeg
mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2025-08-15 14:13:16 +02:00
configure: Don't explicitly disable PIC for windows targets
This revertse08c946c6
and05165c2f7a
. The actual intention ofe08c946c6
was to fix shared library builds for arm/win32, which can also be accomplished in other ways. Disabling pic on those platforms broke inline assembly on cygwin/64 (since some inline assembly requires knowing whether we are building as PIC or not), and might also break inline assembly on other compilers on windows. As a side-effect, this unfortunately brings back all the warnings about PIC not having any effect on that platform. Signed-off-by: Martin Storsjö <martin@martin.st>
This commit is contained in:
3
configure
vendored
3
configure
vendored
@@ -3124,7 +3124,6 @@ case $target_os in
|
|||||||
dlltool="${cross_prefix}dlltool"
|
dlltool="${cross_prefix}dlltool"
|
||||||
ranlib=:
|
ranlib=:
|
||||||
enable dos_paths
|
enable dos_paths
|
||||||
disable pic
|
|
||||||
;;
|
;;
|
||||||
win32|win64)
|
win32|win64)
|
||||||
if enabled shared; then
|
if enabled shared; then
|
||||||
@@ -3149,7 +3148,6 @@ case $target_os in
|
|||||||
objformat="win32"
|
objformat="win32"
|
||||||
ranlib=:
|
ranlib=:
|
||||||
enable dos_paths
|
enable dos_paths
|
||||||
disable pic
|
|
||||||
;;
|
;;
|
||||||
cygwin*)
|
cygwin*)
|
||||||
target_os=cygwin
|
target_os=cygwin
|
||||||
@@ -3164,7 +3162,6 @@ case $target_os in
|
|||||||
SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a'
|
SHFLAGS='-shared -Wl,--out-implib,$(SUBDIR)lib$(FULLNAME).dll.a'
|
||||||
objformat="win32"
|
objformat="win32"
|
||||||
enable dos_paths
|
enable dos_paths
|
||||||
disable pic
|
|
||||||
;;
|
;;
|
||||||
*-dos|freedos|opendos)
|
*-dos|freedos|opendos)
|
||||||
network_extralibs="-lsocket"
|
network_extralibs="-lsocket"
|
||||||
|
Reference in New Issue
Block a user