yugui	2012-08-22 10:14:14 +0900 (Wed, 22 Aug 2012)

  New Revision: 36769

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

  Log:
    * nacl/pepper_main.c (init_loadpath): Pushes the correct load path on
      other architectures than x86_64. Fixes #6873.

  Modified files:
    trunk/ChangeLog
    trunk/nacl/pepper_main.c

Index: ChangeLog
===================================================================
--- ChangeLog	(revision 36768)
+++ ChangeLog	(revision 36769)
@@ -1,3 +1,8 @@
+Thu Aug 16 12:09:51 2012  Yuki Yugui Sonoda  <yugui@g...>
+
+	* nacl/pepper_main.c (init_loadpath): Pushes the correct load path on
+	  other architectures than x86_64. Fixes #6873.
+
 Wed Aug 15 19:37:33 2012  Yuki Yugui Sonoda  <yugui@g...>
 
 	* configure.in (ac_cv_func_shutdown): shutdown(2) has a dummy
Index: nacl/pepper_main.c
===================================================================
--- nacl/pepper_main.c	(revision 36768)
+++ nacl/pepper_main.c	(revision 36769)
@@ -26,7 +26,9 @@
 #include "ppapi/c/ppp_instance.h"
 #include "ppapi/c/ppp_messaging.h"
 
+#include "verconf.h"
 #include "ruby/ruby.h"
+#include "version.h"
 #include "gc.h"
 
 #ifdef HAVE_STRUCT_PPB_CORE
@@ -339,8 +341,8 @@
 static void
 init_loadpath(void)
 {
-  ruby_incpush("lib/ruby/2.0.0");
-  ruby_incpush("lib/ruby/2.0.0/x86_64-nacl");
+  ruby_incpush("lib/ruby/"RUBY_LIB_VERSION);
+  ruby_incpush("lib/ruby/"RUBY_LIB_VERSION"/"RUBY_PLATFORM);
   ruby_incpush(".");
 }
 

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