From owner-svn-ports-head@freebsd.org  Mon Sep 18 19:24:06 2017
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 E0AA8E00AE2;
 Mon, 18 Sep 2017 19:24:06 +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 AFB5477E21;
 Mon, 18 Sep 2017 19:24:06 +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 v8IJO5ie012761;
 Mon, 18 Sep 2017 19:24:05 GMT (envelope-from brooks@FreeBSD.org)
Received: (from brooks@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id v8IJO525012759;
 Mon, 18 Sep 2017 19:24:05 GMT (envelope-from brooks@FreeBSD.org)
Message-Id: <201709181924.v8IJO525012759@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, 18 Sep 2017 19:24:05 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r450073 - head/devel/llvm50
X-SVN-Group: ports-head
X-SVN-Commit-Author: brooks
X-SVN-Commit-Paths: head/devel/llvm50
X-SVN-Commit-Revision: 450073
X-SVN-Commit-Repository: ports
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-head@freebsd.org
X-Mailman-Version: 2.1.23
Precedence: list
List-Id: SVN commit messages for the ports tree for head
 <svn-ports-head.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-ports-head>, 
 <mailto:svn-ports-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-head/>
List-Post: <mailto:svn-ports-head@freebsd.org>
List-Help: <mailto:svn-ports-head-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-ports-head>,
 <mailto:svn-ports-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Mon, 18 Sep 2017 19:24:07 -0000

Author: brooks
Date: Mon Sep 18 19:24:05 2017
New Revision: 450073
URL: https://svnweb.freebsd.org/changeset/ports/450073

Log:
  Fix builds without COMPILER_RT.

Modified:
  head/devel/llvm50/Makefile
  head/devel/llvm50/pkg-plist

Modified: head/devel/llvm50/Makefile
==============================================================================
--- head/devel/llvm50/Makefile	Mon Sep 18 19:06:19 2017	(r450072)
+++ head/devel/llvm50/Makefile	Mon Sep 18 19:24:05 2017	(r450073)
@@ -212,7 +212,7 @@ SHEBANG_FILES+=	tools/clang/tools/scan-view/bin/scan-v
 .endif
 
 .if ${PORT_OPTIONS:MCOMPILER_RT}
-COMPILER_RT_PATTERN=	(asan_blacklist.txt|sanitizer|xray_interface.h)
+COMPILER_RT_PATTERN=	(asan_blacklist.txt|sanitizer|include.xray)
 .endif
 
 .if ${PORT_OPTIONS:MLIT}

Modified: head/devel/llvm50/pkg-plist
==============================================================================
--- head/devel/llvm50/pkg-plist	Mon Sep 18 19:06:19 2017	(r450072)
+++ head/devel/llvm50/pkg-plist	Mon Sep 18 19:24:05 2017	(r450073)
@@ -2302,7 +2302,7 @@ llvm%%LLVM_LIB_VER%%/include/llvm/XRay/YAMLXRayRecord.
 %%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/tsan_interface.h
 %%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/sanitizer/tsan_interface_atomic.h
 %%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/xray/xray_interface.h
-llvm%%LLVM_LIB_VER%%/include/xray/xray_log_interface.h
+%%COMPILER_RT%%llvm%%LLVM_LIB_VER%%/include/xray/xray_log_interface.h
 llvm%%LLVM_LIB_VER%%/lib/BugpointPasses.so
 llvm%%LLVM_LIB_VER%%/lib/LLVMHello.so
 %%GOLD%%llvm%%LLVM_LIB_VER%%/lib/LLVMgold.so