summaryrefslogtreecommitdiff
path: root/lang/ghc/Makefile
diff options
context:
space:
mode:
Diffstat (limited to 'lang/ghc/Makefile')
-rw-r--r--lang/ghc/Makefile21
1 files changed, 10 insertions, 11 deletions
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index b3f995dd1052..f1dc21097680 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -75,21 +75,22 @@ GMP_VARS_OFF= hadrian_gmp_arg=--bignum=native
PROFILE_VARS= enable_profile=YES hadrian_setting_profile=True
PROFILE_VARS_OFF= enable_profile=NO hadrian_setting_profile=False
-GHC_VERSION?= 9.6.7
+GHC_VERSION?= 9.8.4
LLVM_VERSION?= 15
-BOOT_GHC_VERSION?= 9.2.8
+BOOT_GHC_VERSION?= 9.6.7
# LLVM version that bootstrap compiler uses
BOOT_LLVM_VERSION?= 12
-BASE_PACKAGES?= Cabal-3.10.3.0 array-0.5.8.0 base-4.18.3.0 binary-0.8.9.1 \
- bytestring-0.11.5.4 containers-0.6.7 deepseq-1.4.8.1 \
+BASE_PACKAGES?= Cabal-3.10.3.0 array-0.5.8.0 base-4.19.2.0 binary-0.8.9.1 \
+ bytestring-0.12.1.0 containers-0.6.8 deepseq-1.5.1.0 \
directory-1.3.8.5 exceptions-0.10.7 filepath-1.4.301.0 \
ghc-${GHC_VERSION} ghc-bignum-1.3 ghc-compact-0.1.0.0 \
- ghc-prim-0.10.0 haskeline-0.8.2.1 hpc-0.6.2.0 \
- integer-gmp-1.1 mtl-2.3.1 parsec-3.1.16.1 pretty-1.1.3.6 \
- process-1.6.19.0 stm-2.5.1.0 template-haskell-2.20.0.0 \
- terminfo-0.4.1.6 text-2.0.2 time-1.12.2 \
- transformers-0.6.1.0 unix-2.8.6.0 xhtml-3000.2.2.1
+ ghc-prim-0.11.0 haskeline-0.8.2.1 hpc-0.7.0.0 \
+ integer-gmp-1.1 mtl-2.3.1 parsec-3.1.17.0 pretty-1.1.3.6 \
+ process-1.6.25.0 stm-2.5.3.1 semaphore-compat-1.0.0 \
+ template-haskell-2.21.0.0 terminfo-0.4.1.6 text-2.1.1 \
+ time-1.12.2 transformers-0.6.1.0 unix-2.8.6.0 \
+ xhtml-3000.2.2.1
.for pkg in ${BASE_PACKAGES}
PLIST_SUB+= ${pkg:C/-([0-9.])+//:tu}_VERSION=${pkg:C/^([^\.]*-)+//}
@@ -332,8 +333,6 @@ check-hadrian-bootstrap:
@${ECHO_CMD} "Generating Hadrian bootstrap without bootstrap GHC isn't supported"
${FALSE}
.endif
-# Install bootstrap GHC
- ${MAKE} -C ${.CURDIR} pre-configure
# Compile Hadrian
cd ${WRKSRC}/hadrian/bootstrap && \
./bootstrap.py -w ${BOOT_GHC} -s /tmp/hadrian-${GHC_VERSION}-boot.tar.gz