diff options
| author | Brad King <brad.king@kitware.com> | 2021-03-08 12:26:19 -0500 |
|---|---|---|
| committer | Brad King <brad.king@kitware.com> | 2021-03-08 12:28:36 -0500 |
| commit | 23b101de601491342f1b918ee29114d7f66d2ad9 (patch) | |
| tree | 76b464ca86511b1ca3e3948bd5abd8e834221c40 /Modules/CMakeCXXCompilerId.cpp.in | |
| parent | 0ecd9de6ddcaf951968d053ae491949d68d6175f (diff) | |
| download | cmake-23b101de601491342f1b918ee29114d7f66d2ad9.tar.gz | |
Revert "Cray: Fix Cray compiler detection on new platforms"
The justification in commit 9ee4a42813 (Cray: Fix Cray compiler
detection on new platforms, 2020-12-01, v3.19.2~26^2) 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
Diffstat (limited to 'Modules/CMakeCXXCompilerId.cpp.in')
| -rw-r--r-- | Modules/CMakeCXXCompilerId.cpp.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/Modules/CMakeCXXCompilerId.cpp.in b/Modules/CMakeCXXCompilerId.cpp.in index 672fff86d3..a743ce7816 100644 --- a/Modules/CMakeCXXCompilerId.cpp.in +++ b/Modules/CMakeCXXCompilerId.cpp.in @@ -20,7 +20,7 @@ char const* info_simulate = "INFO" ":" "simulate[" SIMULATE_ID "]"; char const* qnxnto = "INFO" ":" "qnxnto[]"; #endif -#if defined(_CRAYC) || defined(__cray__) +#if defined(__CRAYXE) || defined(__CRAYXC) char const *info_cray = "INFO" ":" "compiler_wrapper[CrayPrgEnv]"; #endif @@ -76,7 +76,7 @@ int main(int argc, char* argv[]) #ifdef SIMULATE_VERSION_MAJOR require += info_simulate_version[argc]; #endif -#if defined(_CRAYC) || defined(__cray__) +#if defined(__CRAYXE) || defined(__CRAYXC) require += info_cray[argc]; #endif require += info_language_dialect_default[argc]; |