summaryrefslogtreecommitdiff
path: root/ext/-test-/win32
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-19 00:40:00 +0000
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2012-04-19 00:40:00 +0000
commit1ff181cf8c8bc2226d947bbb04d7129767f6ccf6 (patch)
tree341b9686b538df0362cbdf2675637e2596aab036 /ext/-test-/win32
parent0ba3c640f574764bd6dabaffb8d90e34dcfe0ec5 (diff)
* 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
Diffstat (limited to 'ext/-test-/win32')
-rw-r--r--ext/-test-/win32/dln/extconf.rb8
1 files changed, 6 insertions, 2 deletions
diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb
index 2e52acc..cc94a67 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"