summaryrefslogtreecommitdiff
path: root/nacl
diff options
context:
space:
mode:
authoryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-22 01:14:14 (GMT)
committeryugui <yugui@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-08-22 01:14:14 (GMT)
commit1497959ef5b69c9680931237c7558010130de166 (patch)
treeace56e608eed9f074f097a706688e86a384d2ca8 /nacl
parent0d05a79bca35101e4adc4bcdeb07ecaacd9336d5 (diff)
* nacl/pepper_main.c (init_loadpath): Pushes the correct load path on
other architectures than x86_64. Fixes #6873. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@36769 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'nacl')
-rw-r--r--nacl/pepper_main.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/nacl/pepper_main.c b/nacl/pepper_main.c
index 25087e9..c0e497b 100644
--- a/nacl/pepper_main.c
+++ b/nacl/pepper_main.c
@@ -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 @@ pruby_post_value(void* data)
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(".");
}