summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-17 15:03:19 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2006-07-17 15:03:19 +0000
commitf77119085cc54eb068169e7c6bd02c495e475e9b (patch)
tree67cccc86ac54a748eb0fb2d9fd9da0494a01614d
parent132168780b146409f4a3e89b9b5f5702bf10e8e2 (diff)
downloadruby-f77119085cc54eb068169e7c6bd02c495e475e9b.tar.gz
ruby-f77119085cc54eb068169e7c6bd02c495e475e9b.tar.xz
ruby-f77119085cc54eb068169e7c6bd02c495e475e9b.zip
* ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@10549 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r--ChangeLog4
-rw-r--r--ext/extmk.rb3
2 files changed, 7 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 022686c99..6f5bb08da 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Tue Jul 18 00:01:27 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb: remove LIBRUBY_SO if static linked extensions exist.
+
Mon Jul 17 23:30:46 2006 Nobuyoshi Nakada <nobu@ruby-lang.org>
* configure.in (rb_cv_msvcrt): defaulted to msvcrt. Workaround for a
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 5cd7f498c..b0bc9f3c4 100644
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -480,6 +480,9 @@ Dir.chdir ".."
unless $destdir.to_s.empty?
$mflags.defined?("DESTDIR") or $mflags << "DESTDIR=#{$destdir}"
end
+unless $extlist.empty?
+ rm_f(Config::CONFIG["LIBRUBY_SO"])
+end
puts "making #{rubies.join(', ')}"
$stdout.flush
$mflags.concat(rubies)