nobu	2018-11-06 12:32:57 +0900 (Tue, 06 Nov 2018)

  New Revision: 65561

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=65561

  Log:
    configure.ac: insert DLDSHARED
    
    * configure.ac (DLDSHARED): `.dylib` (created by `-dynamiclib`)
      and `.bundle` (created by `-dynamic -bundle`) on macOS are
      different.  `LIBRUBY_LDSHARED` should be the former always.

  Modified files:
    trunk/Makefile.in
    trunk/configure.ac
Index: configure.ac
===================================================================
--- configure.ac	(revision 65560)
+++ configure.ac	(revision 65561)
@@ -2647,6 +2647,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L2647
 			])
 			rb_cv_dlopen=yes],
 	[darwin*], [	: ${LDSHARED='$(CC) -dynamic -bundle'}
+			: ${DLDSHARED='$(CC) -dynamiclib'}
 			: ${LDFLAGS=""}
 			: ${LIBPATHENV=DYLD_FALLBACK_LIBRARY_PATH}
 			: ${PRELOADENV=DYLD_INSERT_LIBRARIES}
@@ -3059,7 +3060,7 @@ AC_ARG_WITH(soname, https://github.com/ruby/ruby/blob/trunk/configure.ac#L3060
 	    [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
 	])
 
-LIBRUBY_LDSHARED=$LDSHARED
+LIBRUBY_LDSHARED=${DLDSHARED=${LDSHARED}}
 LIBRUBY_DLDFLAGS=$DLDFLAGS
 LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)'
 LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_API_VERSION)'
@@ -3152,7 +3153,6 @@ AS_CASE("$enable_shared", [yes], [ https://github.com/ruby/ruby/blob/trunk/configure.ac#L3153
 	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
 	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 	LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
-	LIBRUBY_LDSHARED='$(CC) -dynamiclib'
 	AS_IF([test "$load_relative" = yes], [
 	    libprefix="@executable_path/../${libdir_basename}"
 	    LIBRUBY_RELATIVE=yes
@@ -3579,6 +3579,7 @@ AC_SUBST(LIBRUBYARG_STATIC) https://github.com/ruby/ruby/blob/trunk/configure.ac#L3579
 AC_SUBST(LIBRUBYARG_SHARED)
 AC_SUBST(SOLIBS)
 AC_SUBST(DLDLIBS)
+AC_SUBST(DLDSHARED)
 AC_SUBST(ENABLE_SHARED)
 AC_SUBST(MAINLIBS)
 AC_SUBST(COMMON_LIBS)
Index: Makefile.in
===================================================================
--- Makefile.in	(revision 65560)
+++ Makefile.in	(revision 65561)
@@ -100,6 +100,7 @@ LIBS = @LIBS@ $(EXTLIBS) https://github.com/ruby/ruby/blob/trunk/Makefile.in#L100
 MISSING = @LIBOBJS@ @ALLOCA@
 ENABLE_SHARED = @ENABLE_SHARED@
 LDSHARED = @LIBRUBY_LDSHARED@
+DLDSHARED = @DLDSHARED@
 DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
 SOLIBS = @SOLIBS@
 ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/