From d110f97055a7d42c92ec5a62abf962b19ebb7a62 Mon Sep 17 00:00:00 2001 From: usa Date: Sun, 4 Jan 2004 16:48:45 +0000 Subject: [PATCH] * lib/mkmf.rb (create_makefile): remove duplicated object files from $objs on DOSISH platforms. git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@5370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ChangeLog | 5 +++++ lib/mkmf.rb | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 38978cf91f..b2025e2b8d 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +Mon Jan 5 01:47:53 2004 NAKAMURA Usaku + + * lib/mkmf.rb (create_makefile): remove duplicated object files + from $objs on DOSISH platforms. + Sat Jan 3 02:44:48 2004 Yukihiro Matsumoto * rubysig.h (TRAP_END): preserve errno before switching context. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 27e534bb39..94269cba34 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -784,7 +784,8 @@ def create_makefile(target, srcprefix = nil) unless $objs then $objs = [] for f in Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")] - $objs.push(File.basename(f, ".*") << "." << $OBJEXT) + obj = File.basename(f, ".*") << "." << $OBJEXT + $objs.push(obj) unless $objs.index(obj) end else for i in $objs