Revert "Cray: Fix Cray compiler detection on new platforms"
The justification in !5561 (merged) confuses detection of the CrayPrgEnv with identification of the Cray compiler. The change regressed detection of the CrayPrgEnv on non-Cray compilers. Revert it pending further investigation into the original problem.
Fixes: #21894 (closed)
Backport: release