Merge commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44'
authorJames Almer <jamrial@gmail.com>
Thu, 12 Oct 2017 17:58:34 +0000 (14:58 -0300)
committerJames Almer <jamrial@gmail.com>
Thu, 12 Oct 2017 17:58:34 +0000 (14:58 -0300)
* commit '808ef43597b1e3d6e69a5b9abe2237c8ddb97b44':
  build: Explicitly set 32-bit/64-bit object formats for nasm/yasm

See d44935cbf4e42e842c11b1eeeaa28377dc8fd6d2

Merged-by: James Almer <jamrial@gmail.com>
configure

index 6deef0a1ec7f751d4a23bf51d9db5c94fa5a8d3f..7a1f4ba959ba403c6ee78ba1af3ccc39760b7d1f 100755 (executable)
--- a/configure
+++ b/configure
@@ -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; }