diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-04 16:48:45 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2004-01-04 16:48:45 +0000 |
| commit | 0ad5a9d74dd63656e7bb46f012ffe2511c9f7888 (patch) | |
| tree | dda8b5ccc6dd0acb3d9bf362fd6b8901520edd5a | |
| parent | 123412fc6f2f1e9c03fb5ddb84e098a907cd3fe2 (diff) | |
| download | ruby-0ad5a9d74dd63656e7bb46f012ffe2511c9f7888.tar.gz ruby-0ad5a9d74dd63656e7bb46f012ffe2511c9f7888.tar.xz ruby-0ad5a9d74dd63656e7bb46f012ffe2511c9f7888.zip | |
* lib/mkmf.rb (create_makefile): remove duplicated object files
from $objs on DOSISH platforms.
git-svn-id: http://svn.ruby-lang.org/repos/ruby/trunk@5370 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rw-r--r-- | lib/mkmf.rb | 3 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Mon Jan 5 01:47:53 2004 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/mkmf.rb (create_makefile): remove duplicated object files + from $objs on DOSISH platforms. + Sat Jan 3 02:44:48 2004 Yukihiro Matsumoto <matz@ruby-lang.org> * rubysig.h (TRAP_END): preserve errno before switching context. diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 27e534bb3..94269cba3 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 |