Author: kevans Date: Mon Mar 30 00:06:56 2020 New Revision: 359433 URL: https://svnweb.freebsd.org/changeset/base/359433
Log: 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 Modified: head/contrib/bmake/main.c head/contrib/bmake/make.h Modified: head/contrib/bmake/main.c ============================================================================== --- head/contrib/bmake/main.c Sun Mar 29 23:59:14 2020 (r359432) +++ head/contrib/bmake/main.c Mon Mar 30 00:06:56 2020 (r359433) @@ -199,6 +199,8 @@ char *makeDependfile; pid_t myPid; int makelevel; +FILE *debug_file; + Boolean forceJobs = FALSE; /* Modified: head/contrib/bmake/make.h ============================================================================== --- head/contrib/bmake/make.h Sun Mar 29 23:59:14 2020 (r359432) +++ head/contrib/bmake/make.h Mon Mar 30 00:06:56 2020 (r359433) @@ -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 _______________________________________________ svn-src-all@freebsd.org mailing list https://lists.freebsd.org/mailman/listinfo/svn-src-all To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
