From owner-svn-ports-all@freebsd.org  Wed Oct 21 16:36:08 2015
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.ysv.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 by mailman.ysv.freebsd.org (Postfix) with ESMTP id 47C76A1BFB5;
 Wed, 21 Oct 2015 16:36:08 +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 mx1.freebsd.org (Postfix) with ESMTPS id 101C31BA6;
 Wed, 21 Oct 2015 16:36:07 +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 t9LGa7Dj029406;
 Wed, 21 Oct 2015 16:36:07 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id t9LGa705029405;
 Wed, 21 Oct 2015 16:36:07 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201510211636.t9LGa705029405@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: Wed, 21 Oct 2015 16:36:07 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r399925 - head/devel/llvm37
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.20
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all/>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Oct 2015 16:36:08 -0000

Author: brooks
Date: Wed Oct 21 16:36:06 2015
New Revision: 399925
URL: https://svnweb.freebsd.org/changeset/ports/399925

Log:
  Fix building LLD without LLDB by applying LLDB patches in the right case.
  
  PR:		203890
  Submitted by:	Laurence 'GreenReaper' Parry <greenreaper@hotmail.com>

Modified:
  head/devel/llvm37/Makefile

Modified: head/devel/llvm37/Makefile
==============================================================================
--- head/devel/llvm37/Makefile	Wed Oct 21 16:34:23 2015	(r399924)
+++ head/devel/llvm37/Makefile	Wed Oct 21 16:36:06 2015	(r399925)
@@ -244,7 +244,7 @@ LLDB_BUILD_DEPENDS+= \
 # Evil hack around gcc48 not providing a usable c++11 environment on 9.x
 PLIST_SUB:=	${PLIST_SUB:NLLDB=*} LLDB="@comment "
 .else
-.if ${PORT_OPTIONS:MLLD}
+.if ${PORT_OPTIONS:MLLDB}
 EXTRA_PATCHES+= \
 	${PATCHDIR}/lldb-patch-svn-247116 \
 	${PATCHDIR}/lldb-patch-svn-249467