From 1ff181cf8c8bc2226d947bbb04d7129767f6ccf6 Mon Sep 17 00:00:00 2001
From: nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>
Date: Thu, 19 Apr 2012 00:40:00 +0000
Subject: [PATCH] * ext/-test-/win32/dln/extconf.rb: need import library for
 ordinal   entry even on mingw.  [ruby-core:44441][Bug #6320]

git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35395 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
---
 ChangeLog                       | 5 +++++
 ext/-test-/win32/dln/extconf.rb | 8 ++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index a33a99a24c..6d40e8471e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+Thu Apr 19 09:39:57 2012  Nobuyoshi Nakada  <nobu@ruby-lang.org>
+
+	* ext/-test-/win32/dln/extconf.rb: need import library for ordinal
+	  entry even on mingw.  [ruby-core:44441][Bug #6320]
+
 Thu Apr 19 09:35:15 2012  Eric Hodel  <drbrain@segment7.net>
 
 	* random.c (random_init):  Clarify that the default seed is
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb
index 2e52acc1d0..cc94a67549 100644
--- a/ext/-test-/win32/dln/extconf.rb
+++ b/ext/-test-/win32/dln/extconf.rb
@@ -5,14 +5,18 @@ if $mingw or $mswin
 
   create_makefile("-test-/win32/dln")
   m = File.read("Makefile")
-  m.sub!(/^OBJS =.*/) {$&+" dlntest.#{$LIBEXT}"}
+  dlntestlib = "dlntest.#{$LIBEXT}"
+  m.sub!(/^OBJS =.*/) {"#{$&} #{dlntestlib}"}
   open("Makefile", "wb") do |mf|
     mf.puts m, "\n"
     sodir = $extout ? "$(RUBYARCHDIR)/" : ''
-    mf.print "#{sodir}$(DLLIB): $(topdir)/dlntest.dll"
+    mf.print "#{sodir}$(DLLIB): #{dlntestlib}"
+    mf.puts
+    mf.puts "#{dlntestlib}: $(topdir)/dlntest.dll"
     mf.puts
     if $mingw
       mf.puts "$(topdir)/dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def"
+      mf.puts "$(topdir)/dlntest.dll: DLDFLAGS += -Wl,--out-implib,#{dlntestlib}"
     end
     mf.puts depend_rules("$(topdir)/dlntest.dll: libdlntest.o libdlntest.def")
     mf.puts "\t$(ECHO) linking shared-object $(@F)\n"