From 661a2cb8026de0ff7aa7608fb9341e1f002e6c45 Mon Sep 17 00:00:00 2001 From: Kyle Evans Date: Mon, 30 Mar 2020 00:06:56 +0000 Subject: [PATCH] bmake: fix -fno-common build debug was declared extern, but debug_file was not; correct this and define debug_file in main.c (as debug is) to fix the -fno-common build. -fno-common will become the default with GCC10/LLVM11. MFC after: 3 days --- contrib/bmake/main.c | 2 ++ contrib/bmake/make.h | 2 +- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/contrib/bmake/main.c b/contrib/bmake/main.c index 7dd4c504f122..b1e893e569e4 100644 --- a/contrib/bmake/main.c +++ b/contrib/bmake/main.c @@ -199,6 +199,8 @@ char *makeDependfile; pid_t myPid; int makelevel; +FILE *debug_file; + Boolean forceJobs = FALSE; /* diff --git a/contrib/bmake/make.h b/contrib/bmake/make.h index c14b2c6bc67e..69cd56e705d0 100644 --- a/contrib/bmake/make.h +++ b/contrib/bmake/make.h @@ -464,7 +464,7 @@ extern pid_t myPid; * There is one bit per module. It is up to the module what debug * information to print. */ -FILE *debug_file; /* Output written here - default stdout */ +extern FILE *debug_file; /* Output written here - default stdout */ extern int debug; #define DEBUG_ARCH 0x00001 #define DEBUG_COND 0x00002