summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-17 08:39:41 +0000
committermrkn <mrkn@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2010-06-17 08:39:41 +0000
commitc07c5e1e9f68e220fe68232f4cf863c65fbbab0c (patch)
tree1fa07257d3b038bbf20daea47f3d1a3fdf035c25
parent6e8c346abc0056fa3cb55258ba5c1dae846c5783 (diff)
* ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so", for the filename extension part of native libraries.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_2@28347 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog7
-rw-r--r--ext/digest/sha2/lib/sha2.rb6
2 files changed, 11 insertions, 2 deletions
diff --git a/ChangeLog b/ChangeLog
index 8c18b84e47..1d30d69fd5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,4 +1,9 @@
-Thu Jun 17 17:30:00 2010 Kenta Murata <mrkn@mrkn.jp>
+Thu Jun 17 17:32:00 2010 Kenta Murata <mrkn@mrkn.jp>
+
+ * ext/digest/sha2/lib/sha2.rb: Darwin uses ".bundle", but not ".so",
+ for the filename extension part of native libraries.
+
+Thu Jun 17 17:30:00 2010 Kenta Murata <mrkn@mrkn.jp>
* ext/digest/sha2/extconf.rb: remove a check for uint64_t.
diff --git a/ext/digest/sha2/lib/sha2.rb b/ext/digest/sha2/lib/sha2.rb
index b8e4609478..9e91787efe 100644
--- a/ext/digest/sha2/lib/sha2.rb
+++ b/ext/digest/sha2/lib/sha2.rb
@@ -10,7 +10,11 @@
# $Id$
require 'digest'
-require 'digest/sha2.so'
+begin
+ require 'digest/sha2.so'
+rescue LoadError
+ require 'digest/sha2.bundle'
+end
module Digest
#