svn commit: r564963 - head/lang/ghc

Mikael Urankar mikael at FreeBSD.org
Thu Feb 11 16:37:42 UTC 2021


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.


More information about the svn-ports-all mailing list