diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-14 15:20:14 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2006-12-14 15:20:14 +0000 |
commit | d63cf3fa2a6800f4a5e57f8ed8017651c226921a (patch) | |
tree | 0e0368f158a0498e4aedb3c341f84a3aa0cbb165 /lib | |
parent | 4409259c939e3dc56c151b8486a901d24d81d8b1 (diff) | |
download | ruby-d63cf3fa2a6800f4a5e57f8ed8017651c226921a.tar.gz |
* lib/mkmf.rb (create_makefile): remove static library before update,
to get rid of sludge of Borland tlib.exe.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@11392 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib')
-rw-r--r-- | lib/mkmf.rb | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d24a407f9f..acd51419cf 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1334,9 +1334,10 @@ site-install-rb: install-rb end end + sep = config_string('BUILD_FILE_SEPARATOR') {|sep| ":/=#{sep}" if sep != "/"} || "" mfile.print "$(RUBYARCHDIR)/" if $extout mfile.print "$(DLLIB): ", (makedef ? "$(DEFFILE) " : ""), "$(OBJS)\n" - mfile.print "\t@-$(RM) $@\n" + mfile.print "\t@-$(RM) $(@#{sep})\n" mfile.print "\t@-$(MAKEDIRS) $(@D)\n" if $extout link_so = LINK_SO.gsub(/^/, "\t") if srcs.any?(&%r"\.(?:#{CXX_EXT.join('|')})\z".method(:===)) @@ -1344,7 +1345,7 @@ site-install-rb: install-rb end mfile.print link_so, "\n\n" unless $static.nil? - mfile.print "$(STATIC_LIB): $(OBJS)\n\t" + mfile.print "$(STATIC_LIB): $(OBJS)\n\t@-$(RM) $(@#{sep})\n\t" mfile.print "$(AR) #{config_string('ARFLAGS') || 'cru '}$@ $(OBJS)" config_string('RANLIB') do |ranlib| mfile.print "\n\t@-#{ranlib} $(DLLIB) 2> /dev/null || true" |