diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-24 17:16:40 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-08-24 17:16:40 +0000 |
| commit | 24dc34e3f4c9d7746d222ca80cf875225dbd9789 (patch) | |
| tree | 0363f2386aadad59fe341cd054f626a76305f070 | |
| parent | b0947c5e04cbc5bb9cde351200575d8da2036eb1 (diff) | |
* 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
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | configure.in | 7 | ||||
| -rw-r--r-- | version.h | 4 |
3 files changed, 11 insertions, 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 diff --git a/configure.in b/configure.in index 41fee2a019..69f292b16f 100644 --- a/configure.in +++ b/configure.in @@ -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" |