aboutsummaryrefslogtreecommitdiffstats
path: root/lib/rake/cpu_counter.rb
diff options
context:
space:
mode:
authorhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-06 09:31:37 +0000
committerhsbt <hsbt@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2014-09-06 09:31:37 +0000
commitf6d2b4858891376dec83e43dccfa028d4b32b184 (patch)
tree053f00bd120e730616a371793eb579edddba29e4 /lib/rake/cpu_counter.rb
parent6057695c87cf8281f3ff9aa37cfdf1c317e1f9c1 (diff)
downloadruby-f6d2b4858891376dec83e43dccfa028d4b32b184.tar.gz
* lib/rake.rb, lib/rake/*, test/rake/*: Update latest rake master(e47d023)
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@47433 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'lib/rake/cpu_counter.rb')
-rw-r--r--lib/rake/cpu_counter.rb3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/rake/cpu_counter.rb b/lib/rake/cpu_counter.rb
index c05b69b7a7..d7c92a6cbe 100644
--- a/lib/rake/cpu_counter.rb
+++ b/lib/rake/cpu_counter.rb
@@ -38,7 +38,8 @@ module Rake
count_via_win32 ||
count_via_sysctl ||
count_via_hwprefs_thread_count ||
- count_via_hwprefs_cpu_count
+ count_via_hwprefs_cpu_count ||
+ count_via_cpuinfo
end
end
end