f6d1039bdc
or 'env MAKEOBJDIRPREFIX=... make' depending on the setting of MAKEOBJDIRPREFIX in the environment. In any case this line kills the original value of ${MAKE}. When during buildworld a new make is built (as is the case during the upgrade) this causes a wrong make to be picked up (the first one in the path). Use the same technique as Makefile.inc1: create a MAKEENV variable and a CRUNCHMAKE that calls ${MAKE} with that MAKEENV prefixed. Use CRUNCHMAKE instead of MAKE throughout the generated makefile. This leaves the original ${MAKE} undisturbed.