summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog5
-rwxr-xr-xext/extmk.rb2
2 files changed, 6 insertions, 1 deletions
diff --git a/ChangeLog b/ChangeLog
index 610124417f..d33f8b3304 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Sun Jul 28 20:10:49 2013 Nobuyoshi Nakada <nobu@ruby-lang.org>
+
+ * ext/extmk.rb (extmake): should make static libraries for extensions
+ to be statically linked. [Bug #7948]
+
Sun Jul 28 17:38:32 2013 Masaki Matsushita <glass.saga@gmail.com>
* string.c: add internal API rb_str_locktmp_ensure().
diff --git a/ext/extmk.rb b/ext/extmk.rb
index 1ca5efd52c..ef9afa0676 100755
--- a/ext/extmk.rb
+++ b/ext/extmk.rb
@@ -227,7 +227,7 @@ def extmake(target)
f.rewind
f.print(s)
f.truncate(f.pos)
- end
+ end unless $static
else
open(makefile, "wb") do |f|
f.puts "# " + DUMMY_SIGNATURE