From 22263729af357eb86e8bc2165a9eaa6f25eec8a6 Mon Sep 17 00:00:00 2001 From: nobu Date: Tue, 17 Apr 2012 14:21:18 +0000 Subject: [PATCH] * ext/-test-/win32/dln/extconf.rb: fix for mingw. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35368 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/-test-/win32/dln/extconf.rb | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/ext/-test-/win32/dln/extconf.rb b/ext/-test-/win32/dln/extconf.rb index f2ea8d55d8..2e52acc1d0 100644 --- a/ext/-test-/win32/dln/extconf.rb +++ b/ext/-test-/win32/dln/extconf.rb @@ -1,4 +1,4 @@ -if /mswin|mingw/ =~ RUBY_PLATFORM +if $mingw or $mswin $objs = ["dlntest.o"] $cleanfiles << "$(topdir)/dlntest.dll" config_string('cleanobjs') {|t| $cleanfiles.concat(t.gsub(/\$\*/, 'dlntest').split)} @@ -9,10 +9,11 @@ if /mswin|mingw/ =~ RUBY_PLATFORM open("Makefile", "wb") do |mf| mf.puts m, "\n" sodir = $extout ? "$(RUBYARCHDIR)/" : '' - mf.print "#{sodir}$(DLLIB): dlntest.#{$LIBEXT}" - mf.puts - mf.puts "dlntest.#{$LIBEXT}: $(topdir)/dlntest.dll" + mf.print "#{sodir}$(DLLIB): $(topdir)/dlntest.dll" mf.puts + if $mingw + mf.puts "$(topdir)/dlntest.dll: DEFFILE := $(srcdir)/libdlntest.def" + end mf.puts depend_rules("$(topdir)/dlntest.dll: libdlntest.o libdlntest.def") mf.puts "\t$(ECHO) linking shared-object $(@F)\n" mf.print "\t-$(Q)$(RM) $@\n"