Date: Mon, 30 Mar 2020 16:22:16 +0000 (UTC) From: Kyle Evans <kevans@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r359443 - head/contrib/bmake Message-ID: <202003301622.02UGMGs5033654@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: kevans Date: Mon Mar 30 16:22:16 2020 New Revision: 359443 URL: https://svnweb.freebsd.org/changeset/base/359443 Log: MFV r359442: 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: head/contrib/bmake/main.c head/contrib/bmake/make.h Directory Properties: head/contrib/bmake/ (props changed) Modified: head/contrib/bmake/main.c ============================================================================== --- head/contrib/bmake/main.c Mon Mar 30 16:20:04 2020 (r359442) +++ head/contrib/bmake/main.c Mon Mar 30 16:22:16 2020 (r359443) @@ -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 @@ -199,7 +199,7 @@ char *makeDependfile; pid_t myPid; int makelevel; -FILE *debug_file; +FILE *debug_file; Boolean forceJobs = FALSE; Modified: head/contrib/bmake/make.h ============================================================================== --- head/contrib/bmake/make.h Mon Mar 30 16:20:04 2020 (r359442) +++ head/contrib/bmake/make.h Mon Mar 30 16:22:16 2020 (r359443) @@ -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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202003301622.02UGMGs5033654>