I your situation I would just create a base commit with the (empty) files you intend to add. Then you should not need to reconfigure to build at least. However it sounds like there is nothing stopping you from just building stage1 with a working base commit, then freezing and iterating on stage2 and testing on non-ghc test cases. It's what I usually do.