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

* configure.in (libprefix): must not append "lib" after $(libdir),

when load_relative is not used on darwin.  [ruby-dev:38182]


git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
nobu 2009-03-20 00:23:01 +00:00
parent 835ad8b35c
commit 9bd7249fa5
2 changed files with 7 additions and 2 deletions

View file

@ -1,3 +1,8 @@
Fri Mar 20 09:22:59 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (libprefix): must not append "lib" after $(libdir),
when load_relative is not used on darwin. [ruby-dev:38182]
Thu Mar 19 20:29:40 2009 Tanaka Akira <akr@fsij.org>
* io.c (rb_mWaitReadable): defined.

View file

@ -1978,11 +1978,11 @@ if test "$enable_shared" = 'yes'; then
RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
LIBRUBY_LDSHARED='cc -dynamiclib -undefined suppress -flat_namespace'
if test "$load_relative" = yes; then
libprefix='@executable_path/..'
libprefix='@executable_path/../lib'
else
libprefix='$(libdir)'
fi
LIBRUBY_DLDFLAGS='-install_name '${libprefix}'/lib/lib$(RUBY_SO_NAME).dylib'
LIBRUBY_DLDFLAGS='-install_name '${libprefix}'/lib$(RUBY_SO_NAME).dylib'
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(MAJOR).$(MINOR).$(TEENY)'
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_* $(XLDFLAGS)'