Attachment 225831 Details for Bug 256605 – v0

[patch] v0

ghc.diff (text/plain), 1.59 KB, created by Mikael Urankar on 2021-06-15 18:00:25 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Mikael Urankar

Created: 2021-06-15 18:00:25 UTC

Size: 1.59 KB

patch

obsolete

>diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
>index 6163fbc703cb..4823cdceec84 100644
>--- a/lang/ghc/Makefile
>+++ b/lang/ghc/Makefile
>@@ -74,7 +74,7 @@ PROFILE_SUB_LIST_OFF=	WITH_PROFILE="NO"
> GHC_VERSION=		8.10.5
> CABAL_VERSION=		3.2.1.0
> HSCOLOUR_VERSION=	1.24.4
>-LLVM_VERSION=		90
>+LLVM_VERSION=		10
> # LLVM version that bootstrap compiler uses
> BOOT_LLVM_VERSION=	90
> 
>@@ -137,7 +137,7 @@ DISTFILES+=		ghc-${BOOT_GHC_VERSION}-boot-${ARCH}-freebsd${BOOTSTRAPS_SUFFIX}${E
> .endif # MBOOT
> 
> .if ${ARCH} == aarch64 || ${ARCH:Marmv*}
>-# ghc-8.10.x on arm requires devel/llvm90
>+# ghc-8.10.x on arm requires devel/llvm10
> # CONFIGURE_TARGET must to be the same as the llvm triple
> CONFIGURE_TARGET=	${ARCH}-unknown-freebsd${"${ARCH:Maarch64}" != "":?:-gnueabihf}
> EXTRA_PATCHES+=		${PATCHDIR}/extra-patch-aclocal.m4
>@@ -153,8 +153,10 @@ CONFIGURE_ENV+=		LLC=llc${LLVM_VERSION} \
> .  if ${BOOT_LLVM_VERSION} != ${LLVM_VERSION}
> BUILD_DEPENDS+=		llc${BOOT_LLVM_VERSION}:devel/llvm${BOOT_LLVM_VERSION}
> # Keep in sync with BOOT_LLVM_VERSION
>-BINARY_ALIAS+=		llc-9.0=llc90 \
>-			opt-9.0=opt90
>+CONFIGURE_ENV_PRECONF=	LLC=llc90 \
>+			OPT=opt90 \
>+			CLANG=clang90 \
>+			CC=clang90
> .  endif
> .endif
> 
>@@ -208,7 +210,7 @@ pre-configure:
> 
> # If we are using bootstrap compiler, configure and install it into ${BOOT_DIR}
> .if empty(PORT_OPTIONS:MBOOT)
>-	cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_CMD} --prefix=${BOOT_DIR}
>+	cd ${BOOT_DIR} && ${CONFIGURE_ENV} ${CONFIGURE_ENV_PRECONF} ${CONFIGURE_CMD} --prefix=${BOOT_DIR}
> 	cd ${BOOT_DIR} && PACKAGES='' ${MAKE_CMD} install
> .else
> # otherwise, make sure we have "ghc" in PATH

Actions: View | Diff

Attachments on bug 256605: 225831