summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-27 14:56:04 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2007-12-27 14:56:04 +0000
commit08bcd50b172e2ef6fc344412ac980203afd6d9bc (patch)
tree34b7681023eedc9751f5572962a6f58c1b5780a7
parentb01cf970082e189a29d2ba964f4e8d1b2f5a6f3a (diff)
downloadruby-08bcd50b172e2ef6fc344412ac980203afd6d9bc.tar.gz
ruby-08bcd50b172e2ef6fc344412ac980203afd6d9bc.tar.xz
ruby-08bcd50b172e2ef6fc344412ac980203afd6d9bc.zip
* mkconfig.rb: should not use the libraries under the source directory
at cross compiling. git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@14741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog5
-rwxr-xr-xmkconfig.rb3
2 files changed, 7 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 484427f62..f80ecaf88 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 23:43:35 2007 Nobuyoshi Nakada <nobu@ruby-lang.org>
* cygwin/GNUmakefile.in (EXTOBJS): uses ruby.rc always for other than
diff --git a/mkconfig.rb b/mkconfig.rb
index 8561bbf0e..7815dd1ee 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)