From d63cf3fa2a6800f4a5e57f8ed8017651c226921a Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 14 Dec 2006 15:20:14 +0000 Subject: * 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 --- ChangeLog | 5 ++++- lib/mkmf.rb | 5 +++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index ee471ec64d..ec2e0864b4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,7 +1,10 @@ -Fri Dec 15 00:07:28 2006 Nobuyoshi Nakada +Fri Dec 15 00:19:53 2006 Nobuyoshi Nakada * win32/Makefile.sub (COMPILE_RULES): latter rule has higher priority. + * lib/mkmf.rb (create_makefile): remove static library before update, + to get rid of sludge of Borland tlib.exe. + Thu Dec 14 18:29:13 2006 Yukihiro Matsumoto * ext/readline/readline.c: NetBSD editline does not have 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" -- cgit v1.2.3