7b53fc5241
Revert e6d4aecb97 "revert back to gnumake-4.4 as gnumake-4.4.1
breaks the build" and aply the fix from
https://github.com/openjdk/jdk/pull/12992