* runruby.rb: prepend LIBRUBY_SO to LD_PRELOAD as well as rubytest.rb.

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@7497 b2dd03c8-39d4-4d8f-98ff-823fe69b080e

1 files changed, 8 insertions, 3 deletions

diff --git a/runruby.rb b/runruby.rb
index ca831410f0..a175dcb9aa 100755
--- a/runruby.rb
+++ b/runruby.rb
@@ -44,9 +44,14 @@ if e = ENV["RUBYLIB"]
 end
 ENV["RUBYLIB"] = $:.replace(libs).join(File::PATH_SEPARATOR)
 
-if File.file?(File.join(archdir, config['LIBRUBY_SO'])) and
-    e = config['LIBPATHENV'] and !e.empty?
-  ENV[e] = [abs_archdir, ENV[e]].compact.join(File::PATH_SEPARATOR)
+libruby_so = File.join(abs_archdir, config['LIBRUBY_SO'])
+if File.file?(libruby_so)
+  if e = config['LIBPATHENV'] and !e.empty?
+    ENV[e] = [abs_archdir, ENV[e]].compact.join(File::PATH_SEPARATOR)
+  end
+  if /linux/ =~ RUBY_PLATFORM
+    ENV["LD_PRELOAD"] = [libruby_so, ENV["LD_PRELOAD"]].compact.join(' ')
+  end
 end
 
 exec ruby, *ARGV