diff options
| author | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-01 11:47:52 +0000 |
|---|---|---|
| committer | usa <usa@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2009-06-01 11:47:52 +0000 |
| commit | 4f2a770bfeb88df73cf3a243accc762330f654dc (patch) | |
| tree | cfbf1ab856e2b885031da21d875cd5e66859a632 | |
| parent | 3a1b61f059194439bc88d4740bb2fb4b4caa34b2 (diff) | |
* lib/mkmf.rb (create_makefile): should set srcs in all paths.
* lib/mkmf.rb (create_makefile): $objs somtimes includes files with
$OBJEXT instead of ".o".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_1_8@23617 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rw-r--r-- | lib/mkmf.rb | 4 |
2 files changed, 9 insertions, 2 deletions
@@ -1,3 +1,10 @@ +Mon Jun 1 20:45:48 2009 NAKAMURA Usaku <usa@ruby-lang.org> + + * lib/mkmf.rb (create_makefile): should set srcs in all paths. + + * lib/mkmf.rb (create_makefile): $objs somtimes includes files with + $OBJEXT instead of ".o". + Mon Jun 1 09:02:48 2009 Yukihiro Matsumoto <matz@ruby-lang.org> * ext/bigdecimal/bigdecimal.c (VpAlloc): avoid ALLOCA_N() to avoid diff --git a/lib/mkmf.rb b/lib/mkmf.rb index 1561e8ae5a..053d632671 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -1467,8 +1467,8 @@ def create_makefile(target, srcprefix = nil) raise "source files duplication - #{objs.sort.map {|b, f| f.inspect}.join(", ")}" end else - $objs.collect! {|o| o.chomp(".o") << ext} unless $OBJEXT == "o" - $srcs ||= $objs.collect {|o| o.chomp(ext) << ".c"} + $objs.collect! {|o| o.sub(/\.o\z/, ext)} unless $OBJEXT == "o" + srcs = $srcs ||= $objs.collect {|o| o.chomp(ext) << ".c"} end target = nil if $objs.empty? |