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>
1  2 
configure

diff --cc configure
index 6deef0a1ec7f751d4a23bf51d9db5c94fa5a8d3f,397d19c9231830a40adb62a77f6663ee7cdc7834..7a1f4ba959ba403c6ee78ba1af3ccc39760b7d1f
+++ b/configure
@@@ -5024,17 -3942,14 +5024,16 @@@ case $target_os i
          ;;
      darwin)
          enabled ppc && add_asflags -force_cpusubtype_ALL
 -        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(SHLIBDIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
 +        install_name_dir_default='$(SHLIBDIR)'
 +        SHFLAGS='-dynamiclib -Wl,-single_module -Wl,-install_name,$(INSTALL_NAME_DIR)/$(SLIBNAME_WITH_MAJOR),-current_version,$(LIBVERSION),-compatibility_version,$(LIBMAJOR)'
          enabled x86_32 && append SHFLAGS -Wl,-read_only_relocs,suppress
 +        strip="${strip} -x"
          add_ldflags -Wl,-dynamic,-search_paths_first
          SLIBSUF=".dylib"
 -        SLIBNAME_WITH_VERSION='$(SLIBPREF)$(NAME).$(LIBVERSION)$(SLIBSUF)'
 -        SLIBNAME_WITH_MAJOR='$(SLIBPREF)$(NAME).$(LIBMAJOR)$(SLIBSUF)'
 +        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 ||
 +        enabled_any pic shared x86_64 ||
              { check_cflags -mdynamic-no-pic && add_asflags -mdynamic-no-pic; }
          check_header dispatch/dispatch.h &&
              add_cppflags '-I\$(SRC_PATH)/compat/dispatch_semaphore'