aboutsummaryrefslogtreecommitdiffstats
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
commit94890f6a9e30351b612b7a2237b7d8c1971a8361 (patch)
tree350a5f81f38ce8534b0311635fed7f9d14616cc9
parent8e75f9705fcd519390652dfebfef99ce3c6314a1 (diff)
downloadruby-94890f6a9e30351b612b7a2237b7d8c1971a8361.tar.gz
* lib/mkmf.rb (init_mkmf): needs default library path even if
cross compiling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@23240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rw-r--r--lib/mkmf.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2ea1857389..6b5533e5aa 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.
+
Tue Apr 21 07:07:45 2009 Yukihiro Matsumoto <matz@ruby-lang.org>
* array.c (rb_ary_push): bypass rb_ary_store().
diff --git a/lib/mkmf.rb b/lib/mkmf.rb
index bc84708719..4c69eb6d6a 100644
--- a/lib/mkmf.rb
+++ b/lib/mkmf.rb
@@ -1873,7 +1873,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 = []