From 0e7eb0f84245c9a831bcbc4760e76d8916c71289 Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 27 Dec 2007 14:56:04 +0000 Subject: [PATCH] * mkconfig.rb: should not use the libraries under the source directory at cross compiling. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@14741 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ mkconfig.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 484427f62a..f80ecaf881 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Thu Dec 27 23:56:01 2007 Nobuyoshi Nakada + + * mkconfig.rb: should not use the libraries under the source directory + at cross compiling. + Thu Dec 27 23:43:35 2007 Nobuyoshi Nakada * cygwin/GNUmakefile.in (EXTOBJS): uses ruby.rc always for other than diff --git a/mkconfig.rb b/mkconfig.rb index 8561bbf0e2..7815dd1eee 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)