[前][次][番号順一覧][スレッド一覧]

ruby-changes:3248

From: ko1@a...
Date: 27 Dec 2007 23:56:23 +0900
Subject: [ruby-changes:3248] nobu - Ruby:r14741 (ruby_1_8, trunk): * mkconfig.rb: should not use the libraries under the source directory

nobu	2007-12-27 23:56:04 +0900 (Thu, 27 Dec 2007)

  New Revision: 14741

  Modified files:
    branches/ruby_1_8/ChangeLog
    branches/ruby_1_8/mkconfig.rb
    trunk/ChangeLog
    trunk/mkconfig.rb

  Log:
    * mkconfig.rb: should not use the libraries under the source directory
      at cross compiling.


  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/ChangeLog?r1=14741&r2=14740
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/ChangeLog?r1=14741&r2=14740
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/trunk/mkconfig.rb?r1=14741&r2=14740
  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi/branches/ruby_1_8/mkconfig.rb?r1=14741&r2=14740

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 14740)
+++ ChangeLog	(revision 14741)
@@ -1,3 +1,8 @@
+Thu Dec 27 23:56:01 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* mkconfig.rb: should not use the libraries under the source directory
+	  at cross compiling.
+
 Thu Dec 27 23:43:35 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* cygwin/GNUmakefile.in (EXTOBJS): uses ruby.rc always for other than
Index: mkconfig.rb
===================================================================
--- mkconfig.rb	(revision 14740)
+++ mkconfig.rb	(revision 14741)
@@ -5,7 +5,8 @@
 $so_name ||= nil
 
 srcdir = File.dirname(__FILE__)
-$:.replace [srcdir+"/lib", "."]
+$:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING)
+$:.unshift(".")
 
 require "fileutils"
 mkconfig = File.basename($0)
Index: ruby_1_8/ChangeLog
===================================================================
--- ruby_1_8/ChangeLog	(revision 14740)
+++ ruby_1_8/ChangeLog	(revision 14741)
@@ -1,3 +1,8 @@
+Thu Dec 27 23:56:01 2007  Nobuyoshi Nakada  <nobu@r...>
+
+	* mkconfig.rb: should not use the libraries under the source directory
+	  at cross compiling.
+
 Thu Dec 27 11:02:45 2007  Nobuyoshi Nakada  <nobu@r...>
 
 	* intern.h, string.c (rb_str_set_len): added for upgrading path from
Index: ruby_1_8/mkconfig.rb
===================================================================
--- ruby_1_8/mkconfig.rb	(revision 14740)
+++ ruby_1_8/mkconfig.rb	(revision 14741)
@@ -5,7 +5,8 @@
 $so_name ||= nil
 
 srcdir = File.dirname(__FILE__)
-$:.replace [srcdir+"/lib", "."]
+$:.replace [srcdir+"/lib"] unless defined?(CROSS_COMPILING)
+$:.unshift(".")
 
 require "fileutils"
 mkconfig = File.basename($0)

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml

[前][次][番号順一覧][スレッド一覧]