diff options
author | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-19 19:02:45 +0000 |
---|---|---|
committer | mame <mame@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2015-06-19 19:02:45 +0000 |
commit | e4fa17a9b926882ee64bee949214187de17bbebc (patch) | |
tree | 9398f4cc6947dec297c6b11c03c83c1fc9e5b3e0 | |
parent | f59356a85a3c672357e2893ab1ac905bb7655829 (diff) |
* enc/make_encmake.rb: the list of encoding extension libraries must
not include encinit.c itself. It caused "undefined reference to
Init_encinit".
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@50978 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 6 | ||||
-rwxr-xr-x | enc/make_encmake.rb | 2 |
2 files changed, 7 insertions, 1 deletions
@@ -1,3 +1,9 @@ +Sat Jun 20 03:56:58 2015 Yusuke Endoh <[email protected]> + + * enc/make_encmake.rb: the list of encoding extension libraries must + not include encinit.c itself. It caused "undefined reference to + Init_encinit". + Sat Jun 20 02:03:53 2015 Naohisa Goto <[email protected]> * process.c (rb_execarg_parent_start1): new macro ALWAYS_NEED_ENVP diff --git a/enc/make_encmake.rb b/enc/make_encmake.rb index 2342317b21..831b0e1962 100755 --- a/enc/make_encmake.rb +++ b/enc/make_encmake.rb @@ -51,7 +51,7 @@ end ALPHANUMERIC_ORDER = proc {|e| e.scan(/(\d+)|(\D+)/).map {|n,a| a||[n.size,n.to_i]}.flatten} def target_encodings - encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS - ["mktable.c"] + encs = Dir.open($srcdir) {|d| d.grep(/.+\.c\z/)} - BUILTIN_ENCS - ["mktable.c", "encinit.c"] encs.each {|e| e.chomp!(".c")} encs.reject! {|e| !ENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}} if !ENC_PATTERNS.empty? encs.reject! {|e| NOENC_PATTERNS.any? {|p| File.fnmatch?(p, e)}} |