diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | lib/mkmf.rb | 10 |
2 files changed, 13 insertions, 3 deletions
@@ -1,3 +1,9 @@ +Fri Jun 3 17:44:25 2016 Reiner Herrmann <reiner@reiner-h.de> + + * lib/mkmf.rb (create_makefile): sort lists of source and object + files in generated Makefile, unless given by extconf.rb. + [Fix GH-1367] + Thu Jun 2 21:18:10 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * win32/win32.c (get_special_folder): use SHGetPathFromIDListEx if diff --git a/lib/mkmf.rb b/lib/mkmf.rb index eee42d0e51..53aea8cecd 100644 --- a/lib/mkmf.rb +++ b/lib/mkmf.rb @@ -2205,11 +2205,15 @@ RULES RbConfig.expand(srcdir = srcprefix.dup) ext = ".#{$OBJEXT}" - orig_srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")] + orig_srcs = Dir[File.join(srcdir, "*.{#{SRC_EXT.join(%q{,})}}")].sort if not $objs srcs = $srcs || orig_srcs - objs = srcs.inject(Hash.new {[]}) {|h, f| h[File.basename(f, ".*") << ext] <<= f; h} - $objs = objs.keys + $objs = [] + objs = srcs.inject(Hash.new {[]}) {|h, f| + h.key?(o = File.basename(f, ".*") << ext) or $objs << o + h[o] <<= f + h + } unless objs.delete_if {|b, f| f.size == 1}.empty? dups = objs.sort.map {|b, f| "#{b[/.*\./]}{#{f.collect {|n| n[/([^.]+)\z/]}.join(',')}}" |