diff options
author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-18 08:41:02 +0000 |
---|---|---|
committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2012-05-18 08:41:02 +0000 |
commit | c7c7dfd2fcbb7305d28cdff5d1ac44f4ad9c4fe3 (patch) | |
tree | d0722e9248c3376780b01950519d486262351531 | |
parent | 5c56769118deac7f79030a87bb272bd82aeba2e4 (diff) | |
download | ruby-c7c7dfd2fcbb7305d28cdff5d1ac44f4ad9c4fe3.tar.gz |
ext/extmk.rb: link archives only
* ext/extmk.rb (extmake): link archives only, skip script only
extension libraries.
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@35695 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
-rw-r--r-- | ChangeLog | 5 | ||||
-rwxr-xr-x | ext/extmk.rb | 2 |
2 files changed, 6 insertions, 1 deletions
@@ -1,3 +1,8 @@ +Fri May 18 17:41:00 2012 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * ext/extmk.rb (extmake): link archives only, skip script only + extension libraries. + Fri May 18 17:25:33 2012 KOSAKI Motohiro <kosaki.motohiro@gmail.com> * cont.c: bump up fiber machine stack size when running on 64bit diff --git a/ext/extmk.rb b/ext/extmk.rb index a498268114..45c0afd423 100755 --- a/ext/extmk.rb +++ b/ext/extmk.rb @@ -234,7 +234,7 @@ def extmake(target) unless $destdir.to_s.empty? or $mflags.defined?("DESTDIR") args += [sysquote("DESTDIR=" + relative_from($destdir, "../"+prefix))] end - if $static and %r(\A-test-) !~ target and ok + if $static and ok and !$objs.empty? and !File.fnmatch?("-*", target) args += ["static"] unless $clean $extlist.push [$static, target, $target, $preload] end |