diff options
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 5 |
2 files changed, 7 insertions, 3 deletions
@@ -1,7 +1,10 @@ -Fri Dec 15 00:07:28 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> +Fri Dec 15 00:19:53 2006 Nobuyoshi Nakada <nobu@ruby-lang.org> * 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 <matz@ruby-lang.org> * ext/readline/readline.c: NetBSD editline does not have diff --git a/lib/mkmf.rb b/lib/mkmf.rb index d24a407f9..acd51419c 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" |