diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-20 00:23:01 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-03-20 00:23:01 +0000 |
| commit | 055c671314a73715ec29ee256923ab8948d7a8dc (patch) | |
| tree | ad3f05e8e773b8c9e63c1944e15d81f1d45b864e | |
| parent | f4501d8d95a7e5ac6cc1faac481fe2b64014aadb (diff) | |
| download | ruby-055c671314a73715ec29ee256923ab8948d7a8dc.tar.gz ruby-055c671314a73715ec29ee256923ab8948d7a8dc.tar.xz ruby-055c671314a73715ec29ee256923ab8948d7a8dc.zip | |
* configure.in (libprefix): must not append "lib" after $(libdir),
when load_relative is not used on darwin. [ruby-dev:38182]
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@23013 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 4 |
2 files changed, 7 insertions, 2 deletions
@@ -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. diff --git a/configure.in b/configure.in index 8309d537e..2320703b4 100644 --- a/configure.in +++ b/configure.in @@ -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)' |