diff options
| author |  Sadie Powell | 2022-12-10 07:00:24 +0000 |
|---|---|---|
| committer | Sadie Powell | 2022-12-10 07:00:24 +0000 |
| commit | 20a1892e31d8b71fa37c69bc6aaf715cf1640f17 (patch) | |
| tree | 5b67e1c5bebee69fabede78da9dab1e9307433cc /make/test/compiler_info.cpp | |
| parent | Remove test-build now its no longer used. (diff) | |
| parent | Fix building with the Intel C++ compiler. (diff) | |
Merge branch 'insp3' into master.
Diffstat (limited to 'make/test/compiler_info.cpp')
| -rw-r--r-- | make/test/compiler_info.cpp | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/make/test/compiler_info.cpp b/make/test/compiler_info.cpp index 3dfe4a596..7c5268dad 100644 --- a/make/test/compiler_info.cpp +++ b/make/test/compiler_info.cpp @@ -19,9 +19,12 @@ #include <iostream> -#if defined __INTEL_COMPILER // Also defines __clang__ and __GNUC__ +#if defined __INTEL_COMPILER // Also defines __GNUC__ # define INSPIRCD_COMPILER_NAME "Intel" # define INSPIRCD_COMPILER_VERSION (__INTEL_COMPILER / 100) << '.' << (__INTEL_COMPILER % 100) +#elif defined __INTEL_CLANG_COMPILER // Also defines __clang__ +# define INSPIRCD_COMPILER_NAME "IntelClang" +# define INSPIRCD_COMPILER_VERSION (__INTEL_CLANG_COMPILER / 10000) << '.' << ((__INTEL_CLANG_COMPILER % 10000) / 100) #elif defined __clang__ // Also defines __GNUC__ # if defined __apple_build_version__ # define INSPIRCD_COMPILER_NAME "AppleClang" |