Merge pull request #9676 from ruby/bsd-make-jobserver-skip

Skip the make job server when using BSD make

(cherry picked from commit 81c7eb5)

Author: hsbt

bundler/lib/bundler/installer/parallel_installer.rb

@@ -125,7 +125,7 @@ def with_jobserver
       # every native extension build with `fatal error U1065: invalid option
       # '-'`. Skip the jobserver when nmake is in use. Other Windows toolchains
       # such as mingw use GNU make and keep working through the inherited pipe.
-      return yield if nmake?
+      return yield if nmake? || bsd_make?
 
       begin
         r, w = IO.pipe
@@ -155,6 +155,12 @@ def nmake?
       /\bnmake/i.match?(make.to_s)
     end
 
+    def bsd_make?
+      return false unless Gem.freebsd_platform?
+      make = ENV["MAKE"] || ENV["make"] || "make"
+      !/\bgmake/i.match?(make)
+    end
+
     def install_serially
       until finished_installing?
         raise "failed to find a spec to enqueue while installing serially" unless spec_install = @specs.find(&:ready_to_enqueue?)

bundler/spec/bundler/installer/parallel_installer_spec.rb

@@ -246,4 +246,50 @@ def redefine_build_jobs
       expect(makeflags_during).to eq(makeflags_before)
     end
   end
+
+  describe "make jobserver on BSD" do
+    # BSD make (the default `make` on FreeBSD) can't parse the GNU
+    # `--jobserver-auth` and aborts every native extension build, so the
+    # jobserver must be skipped there.
+    it "leaves MAKEFLAGS untouched" do
+      parallel_installer = Bundler::ParallelInstaller.new(nil, [], 5, false, false)
+
+      makeflags_before = ENV["MAKEFLAGS"]
+      makeflags_during = :not_yielded
+
+      old_make = ENV["MAKE"]
+      ENV.delete("MAKE")
+      allow(Gem).to receive(:freebsd_platform?).and_return(true)
+      begin
+        parallel_installer.send(:with_jobserver) do
+          makeflags_during = ENV["MAKEFLAGS"]
+        end
+      ensure
+        ENV["MAKE"] = old_make
+      end
+
+      expect(makeflags_during).to eq(makeflags_before)
+    end
+
+    # A BSD user who opts into gmake gets a make that understands the
+    # jobserver, so it should still be set up.
+    it "sets up the jobserver when gmake is used" do
+      parallel_installer = Bundler::ParallelInstaller.new(nil, [], 5, false, false)
+
+      makeflags_during = :not_yielded
+
+      old_make = ENV["MAKE"]
+      ENV["MAKE"] = "gmake"
+      allow(Gem).to receive(:freebsd_platform?).and_return(true)
+      begin
+        parallel_installer.send(:with_jobserver) do
+          makeflags_during = ENV["MAKEFLAGS"]
+        end
+      ensure
+        ENV["MAKE"] = old_make
+      end
+
+      expect(makeflags_during).to include("--jobserver-auth=")
+    end
+  end
 end