From 9904ba97627ddbdab777018c398102d9e177d830 Mon Sep 17 00:00:00 2001
From: Jens Petersen <petersen@redhat.com>
Date: Sat, 19 Jun 2021 14:14:56 +0800
Subject: [PATCH] use LLC and OPT: the configure options are no longer

Resolves: rhbz#1918080
---
 ghc.spec | 11 ++++++-----
 1 file changed, 6 insertions(+), 5 deletions(-)

diff --git a/ghc.spec b/ghc.spec
index b78e571..b8146ce 100644
--- a/ghc.spec
+++ b/ghc.spec
@@ -443,6 +443,11 @@ autoreconf
 # for ghc >= 8.2
 export CC=%{_bindir}/gcc
 
+%ifarch %{ghc_llvm_archs}
+export LLC=$PWD/llvm-%{llvm_version}.src/_build/bin/llc
+export OPT=$PWD/llvm-%{llvm_version}.src/_build/bin/opt
+%endif
+
 # * %%configure induces cross-build due to different target/host/build platform names
 ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
   --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
@@ -451,11 +456,6 @@ export CC=%{_bindir}/gcc
   --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
   --docdir=%{_docdir}/ghc \
   --with-system-libffi \
-%ifarch %{ghc_llvm_archs}
-  --with-llc=$PWD/llvm-%{llvm_version}.src/_build/bin/llc --with-opt=$PWD/llvm-%{llvm_version}.src/_build/bin/opt \
-%else
-  --with-llc=%{_bindir}/llc-%{llvm_major} --with-opt=%{_bindir}/opt-%{llvm_major} \
-%endif
 %ifarch %{ghc_unregisterized_arches}
   --enable-unregisterised \
 %endif
@@ -740,6 +740,7 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
 %changelog
 * Sat Jun 19 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-112
 - remove llvm opt-viewer since it uses python2.7
+- use LLC and OPT to configure llvm paths
 
 * Wed Jun 16 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-111
 - bundle llvm7.0 on aarch64 (#1918080)