summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
Diffstat (limited to 'lib')
-rw-r--r--lib/bundler/installer.rb9
1 files changed, 8 insertions, 1 deletions
diff --git a/lib/bundler/installer.rb b/lib/bundler/installer.rb
index 874aac75b6..44ef396871 100644
--- a/lib/bundler/installer.rb
+++ b/lib/bundler/installer.rb
@@ -202,7 +202,14 @@ module Bundler
return jobs
end
- Bundler.settings[:jobs] || processor_count
+ if jobs = Bundler.settings[:jobs]
+ return jobs
+ end
+
+ # Parallelization has some issues on Windows, so it's not yet the default
+ return 1 if Gem.win_platform?
+
+ processor_count
end
def processor_count