When running make manually, makeFlags will not be passed. Let’s just use an environment variable. (cherry picked from commit 034a9c0e16aab12978bb4a1c1f0e86c64778b388)