(cherry picked from commit 97ac29cafc)
97ac29cafc
Certain files are now only there instead of $NIX_CC (some are in both) (cherry picked from commit 3f30cffa55)
3f30cffa55