Module Name: src
Committed By: sjg
Date: Mon Mar 30 02:41:06 UTC 2020
Modified Files:
src/usr.bin/make: main.c make.h
Log Message:
make: 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.
Patch from kevans at freebsd
To generate a diff of this commit:
cvs rdiff -u -r1.273 -r1.274 src/usr.bin/make/main.c
cvs rdiff -u -r1.104 -r1.105 src/usr.bin/make/make.h
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/usr.bin/make/main.c
diff -u src/usr.bin/make/main.c:1.273 src/usr.bin/make/main.c:1.274
--- src/usr.bin/make/main.c:1.273 Sat Oct 28 21:54:54 2017
+++ src/usr.bin/make/main.c Mon Mar 30 02:41:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $ */
+/* $NetBSD: main.c,v 1.274 2020/03/30 02:41:06 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -69,7 +69,7 @@
*/
#ifndef MAKE_NATIVE
-static char rcsid[] = "$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $";
+static char rcsid[] = "$NetBSD: main.c,v 1.274 2020/03/30 02:41:06 sjg Exp $";
#else
#include <sys/cdefs.h>
#ifndef lint
@@ -81,7 +81,7 @@ __COPYRIGHT("@(#) Copyright (c) 1988, 19
#if 0
static char sccsid[] = "@(#)main.c 8.3 (Berkeley) 3/19/94";
#else
-__RCSID("$NetBSD: main.c,v 1.273 2017/10/28 21:54:54 sjg Exp $");
+__RCSID("$NetBSD: main.c,v 1.274 2020/03/30 02:41:06 sjg Exp $");
#endif
#endif /* not lint */
#endif
@@ -195,6 +195,8 @@ char *makeDependfile;
pid_t myPid;
int makelevel;
+FILE *debug_file;
+
Boolean forceJobs = FALSE;
extern Lst parseIncPath;
Index: src/usr.bin/make/make.h
diff -u src/usr.bin/make/make.h:1.104 src/usr.bin/make/make.h:1.105
--- src/usr.bin/make/make.h:1.104 Mon Feb 12 21:38:09 2018
+++ src/usr.bin/make/make.h Mon Mar 30 02:41:06 2020
@@ -1,4 +1,4 @@
-/* $NetBSD: make.h,v 1.104 2018/02/12 21:38:09 sjg Exp $ */
+/* $NetBSD: make.h,v 1.105 2020/03/30 02:41:06 sjg Exp $ */
/*
* Copyright (c) 1988, 1989, 1990, 1993
@@ -448,7 +448,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
