summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xmkconfig.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 2479eb9c47..74d1e2b4ae 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Dec 27 23:56:01 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * mkconfig.rb: should not use the libraries under the source directory
+ at cross compiling.
+
Thu Dec 27 11:02:45 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* intern.h, string.c (rb_str_set_len): added for upgrading path from
diff --git a/mkconfig.rb b/mkconfig.rb
index bffefdad14..669e195f91 100755
--- a/mkconfig.rb
+++ b/mkconfig.rb
@@ -5,7 +5,8 @@ $install_name ||= nil
$so_name ||= nil
srcdir = File.dirname(__FILE__)
-$:.replace [srcdir+"/lib", "."]
+$:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING)
+$:.unshift(".")
require "fileutils"
mkconfig = File.basename($0)