The new Makefile logic was enabling the stage 1 rules when stage=2,
so "make 2" was rebuilding stage 1.