From owner-svn-ports-all@freebsd.org  Tue Sep 22 19:23:25 2020
Return-Path: <owner-svn-ports-all@freebsd.org>
Delivered-To: svn-ports-all@mailman.nyi.freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1])
 by mailman.nyi.freebsd.org (Postfix) with ESMTP id 455FF3F3AA6;
 Tue, 22 Sep 2020 19:23:25 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org
 [IPv6:2610:1c1:1:606c::19:3])
 (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)
 key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256
 client-signature RSA-PSS (4096 bits) client-digest SHA256)
 (Client CN "mxrelay.nyi.freebsd.org",
 Issuer "Let's Encrypt Authority X3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4BwrnT18bdz4Tx3;
 Tue, 22 Sep 2020 19:23:25 +0000 (UTC)
 (envelope-from yuri@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 0B07B241EB;
 Tue, 22 Sep 2020 19:23:25 +0000 (UTC)
 (envelope-from yuri@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 08MJNOvC040653;
 Tue, 22 Sep 2020 19:23:24 GMT (envelope-from yuri@FreeBSD.org)
Received: (from yuri@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 08MJNOCM040652;
 Tue, 22 Sep 2020 19:23:24 GMT (envelope-from yuri@FreeBSD.org)
Message-Id: <202009221923.08MJNOCM040652@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: yuri set sender to
 yuri@FreeBSD.org using -f
From: Yuri Victorovich <yuri@FreeBSD.org>
Date: Tue, 22 Sep 2020 19:23:24 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r549625 - head/misc/glow
X-SVN-Group: ports-head
X-SVN-Commit-Author: yuri
X-SVN-Commit-Paths: head/misc/glow
X-SVN-Commit-Revision: 549625
X-SVN-Commit-Repository: ports
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.33
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: Tue, 22 Sep 2020 19:23:25 -0000

Author: yuri
Date: Tue Sep 22 19:23:24 2020
New Revision: 549625
URL: https://svnweb.freebsd.org/changeset/ports/549625

Log:
  misc/glow: Fix build on 13
  
  Add the workaround for a bug in Glow that it uses the default C++ compiler when the supplied LLVM version is different.
  
  Reported by:	fallout
  MFH:		2020Q3

Modified:
  head/misc/glow/Makefile

Modified: head/misc/glow/Makefile
==============================================================================
--- head/misc/glow/Makefile	Tue Sep 22 19:19:52 2020	(r549624)
+++ head/misc/glow/Makefile	Tue Sep 22 19:23:24 2020	(r549625)
@@ -41,6 +41,7 @@ CMAKE_ARGS=	-DFREEBSD_LLVM_VERSION:STRING=${LLVM_VER} 
 CMAKE_OFF=	GLOW_BUILD_EXAMPLES GLOW_BUILD_TESTS
 
 BINARY_ALIAS=	python=${PYTHON_CMD}
+BINARY_ALIAS+=	c++=${LOCALBASE}/bin/clang++${LLVM_VER:S/.//} # workaround for the llvm version mixup: https://github.com/pytorch/glow/issues/4910
 
 LLVM_VER=	${LLVM_DEFAULT:C/(.)(.)/\1.\2/}