mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
* configure.in (DLDFLAGS): use linker_flag and changed undefined
and multiply_defined behaviors. cf [ruby-core:25086]. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@24642 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
b0947c5e04
commit
24dc34e3f4
3 changed files with 11 additions and 5 deletions
|
@ -1,3 +1,8 @@
|
|||
Tue Aug 25 02:16:37 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
|
||||
|
||||
* configure.in (DLDFLAGS): use linker_flag and changed undefined
|
||||
and multiply_defined behaviors. cf [ruby-core:25086].
|
||||
|
||||
Mon Aug 24 21:31:37 2009 Kouhei Sutou <kou@cozmixng.org>
|
||||
|
||||
* lib/rss/maker/base.rb, test/rss/test_maker_2.0.rb: fix a bug
|
||||
|
|
|
@ -1723,7 +1723,8 @@ if test "$with_dln_a_out" != yes; then
|
|||
when(rhapsody*) : ${LDSHARED='cc -dynamic -bundle -undefined suppress'}
|
||||
: ${LDFLAGS=""}
|
||||
rb_cv_dlopen=yes ;;
|
||||
when(darwin*) : ${LDSHARED='$(CC) -dynamic -bundle -undefined suppress -flat_namespace'}
|
||||
when(darwin*) : ${LDSHARED='$(CC) -dynamic -bundle'}
|
||||
: ${DLDFLAGS="${linker_flag}-undefined${linker_flag:+,}dynamic_lookup ${linker_flag}-multiply_defined${linker_flag:+,}suppress ${linker_flag}-flat_namespace"}
|
||||
: ${LDFLAGS=""}
|
||||
: ${LIBPATHENV=DYLD_LIBRARY_PATH}
|
||||
# /usr/local/include is always searched for
|
||||
|
@ -2049,13 +2050,13 @@ if test "$enable_shared" = 'yes'; then
|
|||
;;
|
||||
when(darwin*)
|
||||
RUBY_SO_NAME="$RUBY_SO_NAME"'.$(MAJOR).$(MINOR).$(TEENY)'
|
||||
LIBRUBY_LDSHARED='$(CC) -dynamiclib -undefined suppress -flat_namespace'
|
||||
LIBRUBY_LDSHARED='$(CC) -dynamiclib'
|
||||
if test "$load_relative" = yes; then
|
||||
libprefix='@executable_path/../lib'
|
||||
else
|
||||
libprefix='$(libdir)'
|
||||
fi
|
||||
LIBRUBY_DLDFLAGS='-install_name '${libprefix}'/$(LIBRUBY_SO)'
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-install_name '${libprefix}'/$(LIBRUBY_SO)'
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-current_version $(MAJOR).$(MINOR).$(TEENY)'
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-compatibility_version $(ruby_version)'
|
||||
LIBRUBY_DLDFLAGS="$LIBRUBY_DLDFLAGS "'-Wl,-unexported_symbol,_Init_* $(XLDFLAGS)'
|
||||
|
|
|
@ -1,5 +1,5 @@
|
|||
#define RUBY_VERSION "1.9.2"
|
||||
#define RUBY_RELEASE_DATE "2009-08-24"
|
||||
#define RUBY_RELEASE_DATE "2009-08-25"
|
||||
#define RUBY_PATCHLEVEL -1
|
||||
#define RUBY_BRANCH_NAME "trunk"
|
||||
|
||||
|
@ -8,7 +8,7 @@
|
|||
#define RUBY_VERSION_TEENY 1
|
||||
#define RUBY_RELEASE_YEAR 2009
|
||||
#define RUBY_RELEASE_MONTH 8
|
||||
#define RUBY_RELEASE_DAY 24
|
||||
#define RUBY_RELEASE_DAY 25
|
||||
|
||||
#include "ruby/version.h"
|
||||
|
||||
|
|
Loading…
Reference in a new issue