d/freebsd-dev
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

bmake: fix -fno-common build

Browse Source 
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
This commit is contained in:
Kyle Evans 2020-03-30 00:06:56 +00:00
parent 6f00f42ab6
commit 661a2cb802
Notes: svn2git 2020-12-20 02:59:44 +00:00 
svn path=/head/; revision=359433
2 changed files with 3 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
contrib/bmake/main.c
View File

@ -199,6 +199,8 @@ char *makeDependfile;
pid_t myPid; pid_t myPid;
int makelevel; int makelevel;
FILE *debug_file;
Boolean forceJobs = FALSE; Boolean forceJobs = FALSE;
/* /*

2
contrib/bmake/make.h
View File

@ -464,7 +464,7 @@ extern pid_t myPid;
* There is one bit per module. It is up to the module what debug * There is one bit per module. It is up to the module what debug
* information to print. * information to print.
*/ */
FILE *debug_file; /* Output written here - default stdout */ extern FILE *debug_file; /* Output written here - default stdout */
extern int debug; extern int debug;
#define DEBUG_ARCH 0x00001 #define DEBUG_ARCH 0x00001
#define DEBUG_COND 0x00002 #define DEBUG_COND 0x00002