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: * 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
---
 ext/-test-/win32/dln/extconf.rb | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

(limited to 'ext/-test-/win32/dln')

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"
-- 
cgit v1.2.3