osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

version info: Clean clang version 

__VERSION__ is copied from GCC, clang has __clang_version__.

Apparently clang's __VERSION__ already includes the name:

  Compiled (64-bit) using clang Clang 11.1.0
This commit is contained in:
João Valverde 2021-06-07 00:58:00 +01:00 committed by Wireshark GitLab Utility
parent e5cb4ddd87
commit 9e1be36071
1 changed files with 14 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
version_info.c
View File

@ -334,21 +334,23 @@ get_compiler_info(GString *str)
* distinguish between them. * distinguish between them.
*/ */
#if defined(__clang__) #if defined(__clang__)
/* /* clang */
* We know this isn't clang/C2, as _MSC_FULL_VER isn't defined. gchar *version; /* clang's version string has a trailing space. */
* #if defined(__clang_version__)
* Strip out trailing space from clang's __VERSION__ to be consistent version = g_strdup(__clang_version__);
* with other compilers. g_string_append_printf(str, "Clang %s", g_strstrip(version));
*/ #else
gchar* version = g_strstrip(g_strdup(__VERSION__)); version = g_strdup(__VERSION__);
g_string_append_printf(str, "clang %s", version); g_string_append_printf(str, "%s", g_strstrip(version));
#endif /* __clang_version__ */
g_free(version); g_free(version);
#elif defined(__llvm__) #elif defined(__llvm__)
/* llvm-gcc */ /* llvm-gcc */
g_string_append_printf(str, "llvm-gcc %s", __VERSION__); g_string_append_printf(str, "llvm-gcc %s", __VERSION__);
#else /* boring old GCC */ #else
/* boring old GCC */
g_string_append_printf(str, "GCC %s", __VERSION__); g_string_append_printf(str, "GCC %s", __VERSION__);
#endif /* llvm */ #endif
#elif defined(__HP_aCC) #elif defined(__HP_aCC)
g_string_append_printf(str, "HP aCC %d", __HP_aCC); g_string_append_printf(str, "HP aCC %d", __HP_aCC);
#elif defined(__xlC__) #elif defined(__xlC__)
@ -374,6 +376,8 @@ get_compiler_info(GString *str)
(__SUNPRO_C >> 8) & 0xF, (__SUNPRO_C >> 4) & 0xF); (__SUNPRO_C >> 8) & 0xF, (__SUNPRO_C >> 4) & 0xF);
if ((__SUNPRO_C & 0xF) != 0) if ((__SUNPRO_C & 0xF) != 0)
g_string_append_printf(str, " patch %d", __SUNPRO_C & 0xF); g_string_append_printf(str, " patch %d", __SUNPRO_C & 0xF);
#else
g_string_append(str, "unknown compiler");
#endif #endif
} }