shyouhei	2010-12-04 15:34:10 +0900 (Sat, 04 Dec 2010)

  New Revision: 30081

  http://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=rev&revision=30081

  Log:
    merge revision(s) 23240:
    
    * lib/mkmf.rb (init_mkmf): needs default library path even if
      cross compiling.
    
    git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23240 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
    Signed-off-by: URABE, Shyouhei <shyouhei@r...>

  Modified files:
    branches/ruby_1_8_7/ChangeLog
    branches/ruby_1_8_7/lib/mkmf.rb
    branches/ruby_1_8_7/version.h

Index: ruby_1_8_7/ChangeLog
===================================================================
--- ruby_1_8_7/ChangeLog	(revision 30080)
+++ ruby_1_8_7/ChangeLog	(revision 30081)
@@ -1,3 +1,8 @@
+Sat Dec  4 11:35:15 2010  Nobuyoshi Nakada  <nobu@r...>
+
+	* lib/mkmf.rb (init_mkmf): needs default library path even if
+	  cross compiling.
+
 Sat Dec  4 11:25:02 2010  NAKAMURA Usaku  <usa@r...>
 
 	* re.c (rb_reg_regcomp): should succeed the taint status from the
Index: ruby_1_8_7/version.h
===================================================================
--- ruby_1_8_7/version.h	(revision 30080)
+++ ruby_1_8_7/version.h	(revision 30081)
@@ -2,7 +2,7 @@
 #define RUBY_RELEASE_DATE "2010-12-04"
 #define RUBY_VERSION_CODE 187
 #define RUBY_RELEASE_CODE 20101204
-#define RUBY_PATCHLEVEL 328
+#define RUBY_PATCHLEVEL 329
 
 #define RUBY_VERSION_MAJOR 1
 #define RUBY_VERSION_MINOR 8
Index: ruby_1_8_7/lib/mkmf.rb
===================================================================
--- ruby_1_8_7/lib/mkmf.rb	(revision 30080)
+++ ruby_1_8_7/lib/mkmf.rb	(revision 30081)
@@ -1710,7 +1710,7 @@
   $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 = []

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