summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog4
-rwxr-xr-xrunruby.rb11
2 files changed, 12 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b6622390d5..bcdfce1367 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Dec 8 03:26:41 2004 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * runruby.rb: prepend LIBRUBY_SO to LD_PRELOAD as well as rubytest.rb.
+
Wed Dec 08 01:35:44 2004 NAKAMURA Usaku <usa@ruby-lang.org>
* win32/win32.c (is_socket): reorder of function definitions.
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