lib/autobuild/packages/gnumake.rb in autobuild-1.15.0 vs lib/autobuild/packages/gnumake.rb in autobuild-1.16.0

@@ -1,14 +1,18 @@
+require 'rubygems/version'
+
 module Autobuild
     def self.make_is_gnumake?(pkg, path = Autobuild.tool(:make))
         @make_is_gnumake ||= Hash.new
+        @gnumake_version ||= Hash.new
         if @make_is_gnumake.has_key?(path)
             @make_is_gnumake[path]
         else
             begin
                 result = pkg.run('prepare', path, '--version')
                 @make_is_gnumake[path] = (result.first =~ /GNU Make/)
+                @gnumake_version[path] = result.first.scan(/[\d.]+/)[0]
             rescue Autobuild::SubcommandFailed
                 @make_is_gnumake[path] = false
             end
         end
     end
@@ -29,10 +33,14 @@
                 if !make_has_gnumake_jobserver?(pkg, cmd_path) || (pkg.parallel_build_level != Autobuild.parallel_build_level)
                     reserved = pkg.parallel_build_level
                     job_server.get(reserved - 1) # We already have one token taken by autobuild itself
                     yield("-j#{pkg.parallel_build_level}")
                 end
-                yield("--jobserver-fds=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
+                if Gem::Version.new(@gnumake_version[cmd_path]) >= Gem::Version.new("4.2.0")
+                    yield("--jobserver-auth=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
+                else
+                    yield("--jobserver-fds=#{job_server.rio.fileno},#{job_server.wio.fileno}", "-j")
+                end
             end
             yield("-j#{pkg.parallel_build_level}")
         else yield
         end
     ensure