Fix a problem with PKGS_OMITTED_FROM_STAGE1_AND_2 that caused a makefile loop.