svn commit: r359442 - vendor/NetBSD/bmake/dist

[Kyle Evans]

Author: kevans
Date: Mon Mar 30 16:20:04 2020
New Revision: 359442
URL: https://svnweb.freebsd.org/changeset/base/359442

Log:
  bmake: import -fno-common fix build back from upstream
  
  sjg@ committed the local patch previously committed upstream; pull it in to
  vendor/ to ease any potential stress of future imports.

Modified:
  vendor/NetBSD/bmake/dist/main.c
  vendor/NetBSD/bmake/dist/make.h

Modified: vendor/NetBSD/bmake/dist/main.c
==============================================================================
--- vendor/NetBSD/bmake/dist/main.c	Mon Mar 30 16:04:25 2020	(r359441)
+++ vendor/NetBSD/bmake/dist/main.c	Mon Mar 30 16:20:04 2020	(r359442)
@@ -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, 1989, 1990, 1993
 #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
@@ -198,6 +198,8 @@ char *progname;				/* the program name */
 char *makeDependfile;
 pid_t myPid;
 int makelevel;
+
+FILE *debug_file;
 
 Boolean forceJobs = FALSE;
 

Modified: vendor/NetBSD/bmake/dist/make.h
==============================================================================
--- vendor/NetBSD/bmake/dist/make.h	Mon Mar 30 16:04:25 2020	(r359441)
+++ vendor/NetBSD/bmake/dist/make.h	Mon Mar 30 16:20:04 2020	(r359442)
@@ -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
@@ -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