Ensuring top-level make works with 12.2 tools