diff options
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rw-r--r-- | configure.ac | 5 |
2 files changed, 4 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index e8debea17d..724773cd6c 100644 --- a/Makefile.in +++ b/Makefile.in @@ -100,6 +100,7 @@ LIBS = @LIBS@ $(EXTLIBS) 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@ diff --git a/configure.ac b/configure.ac index ad02722858..37435e4db9 100644 --- a/configure.ac +++ b/configure.ac @@ -2647,6 +2647,7 @@ AS_IF([test "$with_dln_a_out" != yes], [ ]) 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, [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], [ 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) AC_SUBST(LIBRUBYARG_SHARED) AC_SUBST(SOLIBS) AC_SUBST(DLDLIBS) +AC_SUBST(DLDSHARED) AC_SUBST(ENABLE_SHARED) AC_SUBST(MAINLIBS) AC_SUBST(COMMON_LIBS) |