From owner-svn-src-all@freebsd.org  Mon Oct  8 22:38:29 2018
Return-Path: <owner-svn-src-all@freebsd.org>
Delivered-To: svn-src-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 277DF10CE339;
 Mon,  8 Oct 2018 22:38:29 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id CFAD782EC2;
 Mon,  8 Oct 2018 22:38:28 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org (repo.freebsd.org
 [IPv6:2610:1c1:1:6068::e6a:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id C602EDC1;
 Mon,  8 Oct 2018 22:38:28 +0000 (UTC)
 (envelope-from brooks@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w98McS9n024689;
 Mon, 8 Oct 2018 22:38:28 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id w98McSVF024688;
 Mon, 8 Oct 2018 22:38:28 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201810082238.w98McSVF024688@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: brooks set sender to
 brooks@FreeBSD.org using -f
From: Brooks Davis <brooks@FreeBSD.org>
Date: Mon, 8 Oct 2018 22:38:28 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
 svn-src-stable@freebsd.org, svn-src-stable-11@freebsd.org
Subject: svn commit: r339245 - stable/11/usr.bin/bmake
X-SVN-Group: stable-11
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: stable/11/usr.bin/bmake
X-SVN-Commit-Revision: 339245
X-SVN-Commit-Repository: base
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.27
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
 user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all/>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-all>,
 <mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 08 Oct 2018 22:38:29 -0000

Author: brooks
Date: Mon Oct  8 22:38:28 2018
New Revision: 339245
URL: https://svnweb.freebsd.org/changeset/base/339245

Log:
  MFC r338925:
  
  Don't override LDFLAGS set in bsd.cpu.mk.
  
  This is a direct commit to a generated file.  Simon plans to fix this
  upstream before the next import.
  
  PR:		231557
  Approved by:	re (gjb)
  Obtained from:	CheriBSD
  Sponsored by:	DARPA, AFRL

Modified:
  stable/11/usr.bin/bmake/Makefile.config
Directory Properties:
  stable/11/   (props changed)

Modified: stable/11/usr.bin/bmake/Makefile.config
==============================================================================
--- stable/11/usr.bin/bmake/Makefile.config	Mon Oct  8 19:48:58 2018	(r339244)
+++ stable/11/usr.bin/bmake/Makefile.config	Mon Oct  8 22:38:28 2018	(r339245)
@@ -16,7 +16,7 @@ DEFAULT_SYS_PATH?= .../share/mk:/usr/share/mk
 
 CPPFLAGS+= 
 CFLAGS+= ${CPPFLAGS} -DHAVE_CONFIG_H
-LDFLAGS= 
+LDFLAGS+= 
 LIBOBJS=  ${LIBOBJDIR}stresep$U.o
 LDADD= 
 USE_META= yes