From d6c6653490e101ded061a0bfca2e49bac91cb907 Mon Sep 17 00:00:00 2001 From: shyouhei Date: Sat, 4 Dec 2010 06:34:10 +0000 Subject: merge revision(s) 23240: * lib/mkmf.rb (init_mkmf): needs default library path even if cross compiling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e Signed-off-by: URABE, Shyouhei git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8_7@30081 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/mkmf.rb | 2 +- version.h | 2 +- 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index 10a71ebc82..3c7cb1478c 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Sat Dec 4 11:35:15 2010 Nobuyoshi Nakada + + * lib/mkmf.rb (init_mkmf): needs default library path even if + cross compiling. + Sat Dec 4 11:25:02 2010 NAKAMURA Usaku * re.c (rb_reg_regcomp): should succeed the taint status from the diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 416292d0d1..c9e738a128 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1710,7 +1710,7 @@ def init_mkmf(config = CONFIG) $LIBRUBYARG = "" $LIBRUBYARG_STATIC = config['LIBRUBYARG_STATIC'] $LIBRUBYARG_SHARED = config['LIBRUBYARG_SHARED'] - $DEFLIBPATH = $extmk ? ["$(topdir)"] : CROSS_COMPILING ? [] : ["$(libdir)"] + $DEFLIBPATH = [$extmk ? "$(topdir)" : "$(libdir)"] $DEFLIBPATH.unshift(".") $LIBPATH = [] $INSTALLFILES = [] diff --git a/version.h b/version.h index ccf97b50da..2b6c361b0a 100644 --- a/version.h +++ b/version.h @@ -2,7 +2,7 @@ #define RUBY_RELEASE_DATE "2010-12-04" #define RUBY_VERSION_CODE 187 #define RUBY_RELEASE_CODE 20101204 -#define RUBY_PATCHLEVEL 328 +#define RUBY_PATCHLEVEL 329 #define RUBY_VERSION_MAJOR 1 #define RUBY_VERSION_MINOR 8 -- cgit v1.2.3