mirror of
https://github.com/FFmpeg/FFmpeg.git
synced 2024-12-23 12:43:46 +02:00
Merge commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44'
* commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44':
build: Explicitly set 32-bit/64-bit object formats for nasm/yasm
See d44935cbf4
Merged-by: James Almer <jamrial@gmail.com>
This commit is contained in:
commit
e4ad3e6f64
1
configure
vendored
1
configure
vendored
@ -5032,7 +5032,6 @@ case $target_os in
|
||||
SLIBSUF=".dylib"
|
||||
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
|
||||
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
|
||||
objformat="macho"
|
||||
enabled x86_64 && objformat="macho64" || objformat="macho32"
|
||||
enabled_any pic shared x86_64 ||
|
||||
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
|
||||
|
Loading…
Reference in New Issue
Block a user