| Andrew Geissler | 635e0e4 | 2020-08-21 15:58:33 -0500 | [diff] [blame] | 1 | From 98530865795300008fe06bb647a6fc2dddfc7967 Mon Sep 17 00:00:00 2001 |
| 2 | From: Romain Geissler <romain.geissler@amadeus.com> |
| 3 | Date: Mon, 27 Jan 2020 09:28:43 +0000 |
| 4 | Subject: [PATCH] Fix build with gcc 10 which defaults to -fno-common (cf |
| 5 | https://gcc.gnu.org/gcc-10/porting_to.html) |
| 6 | |
| 7 | This fixes the following link error I see when I use the latest gcc 10 |
| 8 | git branch: |
| 9 | /opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/serve.o:(.bss+0x0): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here |
| 10 | /opt/1A/toolchain/x86_64-v20.0.7/lib/gcc/x86_64-1a-linux-gnu/10.0.1/../../../../x86_64-1a-linux-gnu/bin/ld: src/stats.o:(.data+0x20): multiple definition of `stats_text'; src/prefork.o:(.bss+0x0): first defined here |
| 11 | collect2: error: ld returned 1 exit status |
| 12 | |
| 13 | Upstream-Status: Backport [https://github.com/distcc/distcc/pull/373] |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | src/stats.h | 2 +- |
| 17 | 1 file changed, 1 insertion(+), 1 deletion(-) |
| 18 | |
| 19 | diff --git a/src/stats.h b/src/stats.h |
| 20 | index 9bde285..74d4690 100644 |
| 21 | --- a/src/stats.h |
| 22 | +++ b/src/stats.h |
| 23 | @@ -33,7 +33,7 @@ enum stats_e { STATS_TCP_ACCEPT, STATS_REJ_BAD_REQ, STATS_REJ_OVERLOAD, |
| 24 | STATS_COMPILE_OK, STATS_COMPILE_ERROR, STATS_COMPILE_TIMEOUT, |
| 25 | STATS_CLI_DISCONN, STATS_OTHER, STATS_ENUM_MAX }; |
| 26 | |
| 27 | -const char *stats_text[20]; |
| 28 | +extern const char *stats_text[20]; |
| 29 | |
| 30 | int dcc_stats_init(void); |
| 31 | void dcc_stats_init_kid(void); |
| 32 | -- |
| 33 | 2.28.0 |
| 34 | |