[patch] llvm version fix example

ghc-arm-fix.patch (text/plain), 1.44 KB, created by Nick Bowler on 2021-01-17 02:12:29 UTC

diff --git a/ghc-8.10.3.ebuild~ b/ghc-8.10.3.ebuild
index 4b91c85..b57b2b8 100644
--- a/ghc-8.10.3.ebuild~
+++ b/ghc-8.10.3.ebuild
@@ -3,6 +3,8 @@
 
 EAPI=7
 
+inherit llvm
+
 # to make make a crosscompiler use crossdev and symlink ghc tree into
 # cross overlay. result would look like 'cross-sparc-unknown-linux-gnu/ghc'
 export CBUILD=${CBUILD:-${CHOST}}
@@ -87,8 +89,11 @@ RDEPEND="
 	elfutils? ( dev-libs/elfutils )
 	!ghcmakebinary? ( dev-libs/libffi:= )
 	numa? ( sys-process/numactl )
+	arm? ( sys-devel/llvm:9 )
 "
 
+LLVM_MAX_SLOT=9
+
 # This set of dependencies is needed to run
 # prebuilt ghc. We specifically avoid ncurses
 # dependency with:
@@ -361,6 +366,8 @@ pkg_pretend() {
 pkg_setup() {
 	ghc-check-reqs check-reqs_pkg_setup
 
+	llvm_pkg_setup
+
 	# quiet portage about prebuilt binaries
 	use binary && QA_PREBUILT="*"
 
@@ -585,14 +592,15 @@ src_configure() {
 			Windres=${CTARGET}-windres
 			DllWrap=${CTARGET}-dllwrap
 			# we set the linker explicitly below
-			--disable-ld-override
+#			--disable-ld-override
 		)
 		case ${CTARGET} in
 			arm*)
 				# ld.bfd-2.28 does not work for ghc. Force ld.gold
 				# instead. This should be removed once gentoo gets
 				# a fix for R_ARM_COPY bug: https://sourceware.org/PR16177
-				econf_args+=(LD=${CTARGET}-ld.gold)
+#				econf_args+=(LD=${CTARGET}-ld.gold)
+				econf_args+=("LLC=$(command -v llc)" OPT="$(command -v opt)")
 			;;
 			sparc*)
 				# ld.gold-2.28 does not work for ghc. Force ld.bfd