diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-17 14:22:01 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-04-17 14:22:01 +0000 |
commit | 5468593e147762d7f9f9fee59097b6781a555093 (patch) | |
tree | 32b006b9ecbd90e410c63b0670d891ec80388621 /ext | |
parent | 4f0439617edfff2fa4dbc8b0c07a65bcf37cda53 (diff) |
merge revision(s) 35368:
* ext/-test-/win32/dln/extconf.rb: fix for mingw.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_9_3@35369 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'ext')
-rw-r--r-- | ext/-test-/win32/dln/extconf.rb | 9 |
1 files 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" |