summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-21 00:20:25 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2009-04-21 00:20:25 +0000
commit4a9e4166bfe979539ad7f933b308db110c1ffb51 (patch)
tree93730f68eb7e129063a4ebe04907136d0ec7ebfa
parent0d6f4f36682f5dd9d8932e931104ba40f0325ed0 (diff)
* 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
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
-rw-r--r--version.h6
3 files changed, 9 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index f3d140a56b..e97020c53d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Tue Apr 21 09:20:21 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * lib/mkmf.rb (init_mkmf): needs default library path even if
+ cross compiling.
+
Sun Apr 19 14:31:57 2009 Nobuyoshi Nakada <nobu@ruby-lang.org>
* eval.c (ruby_cleanup): the order of local variables on stack is
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index 4d3f51fc6d..50cc5a7457 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1713,7 +1713,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 06fdc8771c..c6416878df 100644
--- a/version.h
+++ b/version.h
@@ -1,7 +1,7 @@
#define RUBY_VERSION "1.8.8"
-#define RUBY_RELEASE_DATE "2009-04-19"
+#define RUBY_RELEASE_DATE "2009-04-21"
#define RUBY_VERSION_CODE 188
-#define RUBY_RELEASE_CODE 20090419
+#define RUBY_RELEASE_CODE 20090421
#define RUBY_PATCHLEVEL -1
#define RUBY_VERSION_MAJOR 1
@@ -9,7 +9,7 @@
#define RUBY_VERSION_TEENY 8
#define RUBY_RELEASE_YEAR 2009
#define RUBY_RELEASE_MONTH 4
-#define RUBY_RELEASE_DAY 19
+#define RUBY_RELEASE_DAY 21
#ifdef RUBY_EXTERN
RUBY_EXTERN const char ruby_version[];