diff options
| author | Dario Lombardo <lomato@gmail.com> | 2020-06-10 22:36:40 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2020-06-15 11:55:55 +0000 |
| commit | 326a43627a70d11371b3f99f3f59f44665065397 (patch) | |
| tree | 97ac185c507a72aee19aff5957ead45522b202bb /version_info.c | |
| parent | ef8da8e355912f838e066caf73c6786469fd856a (diff) | |
version_info: fix clang output.
Clang's __VERSION__ shows a trailing space. This ends up in a useless
space before the period, that shows a different output from other
compilers. Example:
Built using clang Clang 10.0.0 .
Built using gcc 7.5.0.
Fixed by stripping it in clang only.
Change-Id: I98dfce46b189fc6b2b58950dbb27f69d271bd729
Reviewed-on: https://code.wireshark.org/review/37480
Petri-Dish: Guy Harris <gharris@sonic.net>
Tested-by: Petri Dish Buildbot
Reviewed-by: Guy Harris <gharris@sonic.net>
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'version_info.c')
| -rw-r--r-- | version_info.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/version_info.c b/version_info.c index 928214a8c0..7f5aeac2a4 100644 --- a/version_info.c +++ b/version_info.c @@ -328,8 +328,13 @@ get_compiler_info(GString *str) #if defined(__clang__) /* * We know this isn't clang/C2, as _MSC_FULL_VER isn't defined. + * + * Strip out trailing space from clang's __VERSION__ to be consistent + * with other compilers. */ - g_string_append_printf(str, "\n\nBuilt using clang %s.\n", __VERSION__); + gchar* version = g_strstrip(g_strdup(__VERSION__)); + g_string_append_printf(str, "\n\nBuilt using clang %s.\n", version); + g_free(version); #elif defined(__llvm__) /* llvm-gcc */ g_string_append_printf(str, "\n\nBuilt using llvm-gcc %s.\n", __VERSION__); |