kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

configure.ac: insert DLDSHARED

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

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65561 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2018-11-06 03:32:57 +00:00
parent f740687e78
commit 67de434219
2 changed files with 4 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Makefile.in
View file

@ -100,6 +100,7 @@ LIBS = @LIBS@ $(EXTLIBS)
MISSING = @LIBOBJS@ @ALLOCA@ MISSING = @LIBOBJS@ @ALLOCA@
ENABLE_SHARED = @ENABLE_SHARED@ ENABLE_SHARED = @ENABLE_SHARED@
LDSHARED = @LIBRUBY_LDSHARED@ LDSHARED = @LIBRUBY_LDSHARED@
DLDSHARED = @DLDSHARED@
DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG) DLDFLAGS = @LIBRUBY_DLDFLAGS@ $(XLDFLAGS) $(ARCH_FLAG)
SOLIBS = @SOLIBS@ SOLIBS = @SOLIBS@
ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@ ENABLE_DEBUG_ENV = @ENABLE_DEBUG_ENV@

5
configure.ac
View file

@ -2647,6 +2647,7 @@ AS_IF([test "$with_dln_a_out" != yes], [
]) ])
rb_cv_dlopen=yes], rb_cv_dlopen=yes],
[darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'} [darwin*], [ : ${LDSHARED='$(CC) -dynamic -bundle'}
: ${DLDSHARED='$(CC) -dynamiclib'}
: ${LDFLAGS=""} : ${LDFLAGS=""}
: ${LIBPATHENV=DYLD_FALLBACK_LIBRARY_PATH} : ${LIBPATHENV=DYLD_FALLBACK_LIBRARY_PATH}
: ${PRELOADENV=DYLD_INSERT_LIBRARIES} : ${PRELOADENV=DYLD_INSERT_LIBRARIES}
@ -3059,7 +3060,7 @@ AC_ARG_WITH(soname,
[RUBY_SO_NAME='$(RUBY_BASE_NAME)']) [RUBY_SO_NAME='$(RUBY_BASE_NAME)'])
]) ])
LIBRUBY_LDSHARED=$LDSHARED LIBRUBY_LDSHARED=${DLDSHARED=${LDSHARED}}
LIBRUBY_DLDFLAGS=$DLDFLAGS LIBRUBY_DLDFLAGS=$DLDFLAGS
LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)' LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_PROGRAM_VERSION)'
LIBRUBY_SONAME='lib$(RUBY_SO_NAME).$(SOEXT).$(RUBY_API_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_SO='lib$(RUBY_SO_NAME).$(SOEXT)'
LIBRUBY_SONAME='$(LIBRUBY_SO)' LIBRUBY_SONAME='$(LIBRUBY_SO)'
LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)' LIBRUBY_ALIASES='lib$(RUBY_INSTALL_NAME).$(SOEXT)'
LIBRUBY_LDSHARED='$(CC) -dynamiclib'
AS_IF([test "$load_relative" = yes], [ AS_IF([test "$load_relative" = yes], [
libprefix="@executable_path/../${libdir_basename}" libprefix="@executable_path/../${libdir_basename}"
LIBRUBY_RELATIVE=yes LIBRUBY_RELATIVE=yes
@ -3579,6 +3579,7 @@ AC_SUBST(LIBRUBYARG_STATIC)
AC_SUBST(LIBRUBYARG_SHARED) AC_SUBST(LIBRUBYARG_SHARED)
AC_SUBST(SOLIBS) AC_SUBST(SOLIBS)
AC_SUBST(DLDLIBS) AC_SUBST(DLDLIBS)
AC_SUBST(DLDSHARED)
AC_SUBST(ENABLE_SHARED) AC_SUBST(ENABLE_SHARED)
AC_SUBST(MAINLIBS) AC_SUBST(MAINLIBS)
AC_SUBST(COMMON_LIBS) AC_SUBST(COMMON_LIBS)