diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | ext/-test-/win32/dln/extconf.rb | 8 |
2 files changed, 11 insertions, 2 deletions
@@ -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" |