From owner-svn-ports-head@freebsd.org  Thu Feb 11 16:37:42 2021
Return-Path: <owner-svn-ports-head@freebsd.org>
Delivered-To: svn-ports-head@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 92B2952D9EA;
 Thu, 11 Feb 2021 16:37:42 +0000 (UTC)
 (envelope-from mikael@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 "R3" (verified OK))
 by mx1.freebsd.org (Postfix) with ESMTPS id 4Dc2Nk3r2vz4V8C;
 Thu, 11 Feb 2021 16:37:42 +0000 (UTC)
 (envelope-from mikael@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 769AF144EE;
 Thu, 11 Feb 2021 16:37:42 +0000 (UTC)
 (envelope-from mikael@FreeBSD.org)
Received: from repo.freebsd.org ([127.0.1.37])
 by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 11BGbgLb094589;
 Thu, 11 Feb 2021 16:37:42 GMT (envelope-from mikael@FreeBSD.org)
Received: (from mikael@localhost)
 by repo.freebsd.org (8.15.2/8.15.2/Submit) id 11BGbgeu094588;
 Thu, 11 Feb 2021 16:37:42 GMT (envelope-from mikael@FreeBSD.org)
Message-Id: <202102111637.11BGbgeu094588@repo.freebsd.org>
X-Authentication-Warning: repo.freebsd.org: mikael set sender to
 mikael@FreeBSD.org using -f
From: Mikael Urankar <mikael@FreeBSD.org>
Date: Thu, 11 Feb 2021 16:37:42 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r564963 - head/lang/ghc
X-SVN-Group: ports-head
X-SVN-Commit-Author: mikael
X-SVN-Commit-Paths: head/lang/ghc
X-SVN-Commit-Revision: 564963
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.34
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: Thu, 11 Feb 2021 16:37:42 -0000

Author: mikael
Date: Thu Feb 11 16:37:41 2021
New Revision: 564963
URL: https://svnweb.freebsd.org/changeset/ports/564963

Log:
  lang/ghc: use CONFIGURE_ENV instead of BINARY_ALIAS on arm
  
  GHC saves the llvm command name (llc, opt, clang) found at compile time in its
  settings file.
  Using BINARY_ALIAS allows lang/ghc to build but breaks
  ghc ports (devel/hs-cabal-install for example)
  GHC configure script accepts now to define LLC, OPT, CLANG as
  environment variable, switch to it.
  
  <no location info>: error:
      Warning: Couldn't figure out LLVM version!
               Make sure you have installed LLVM 9
  
  <no location info>: error: ghc: could not execute: opt-9.0
  
  PR:		252166, 253367
  Approved by:	portmgr (tier-2 blanket)

Modified:
  head/lang/ghc/Makefile

Modified: head/lang/ghc/Makefile
==============================================================================
--- head/lang/ghc/Makefile	Thu Feb 11 16:36:24 2021	(r564962)
+++ head/lang/ghc/Makefile	Thu Feb 11 16:37:41 2021	(r564963)
@@ -146,10 +146,10 @@ CONFIGURE_TARGET=	${ARCH}-unknown-freebsd${"${ARCH:Maa
 EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-aclocal.m4
 BUILD_DEPENDS+=		llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 RUN_DEPENDS+=		llc${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
-# Keep in sync with LLVM_VERSION
-BINARY_ALIAS=		llc-9.0=llc90 \
-			opt-9.0=opt90
-CC=			clang90
+CONFIGURE_ENV+=		LLC=llc${LLVM_VERSION} \
+			OPT=opt${LLVM_VERSION} \
+			CLANG=clang${LLVM_VERSION} \
+			CC=clang${LLVM_VERSION}
 
 # When GHC being compiled and GHC used for bootstrapping support different
 # LLVM versions, we have to pull in both. Luckily, this is relatively rare.