Commit e4ad3e6f authored by James Almer's avatar James Almer

Merge commit '808ef435'

* commit '808ef435':
  build: Explicitly set 32-bit/64-bit object formats for nasm/yasm

See d44935cbMerged-by: 's avatarJames Almer <jamrial@gmail.com>
parents 6fb580e7 808ef435
...@@ -5032,7 +5032,6 @@ case $target_os in ...@@ -5032,7 +5032,6 @@ case $target_os in
SLIBSUF=".dylib" SLIBSUF=".dylib"
SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)' SLIBNAME_WITH_VERSION='$(SLIBPREF)$(FULLNAME).$(LIBVERSION)$(SLIBSUF)'
SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)' SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(FULLNAME).$(LIBMAJOR)$(SLIBSUF)'
objformat="macho"
enabled x86_64 && objformat="macho64" || objformat="macho32" enabled x86_64 && objformat="macho64" || objformat="macho32"
enabled_any pic shared x86_64 || enabled_any pic shared x86_64 ||
{ check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; } { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment