rpms/ghc
7
0
Fork 0
Code Issues Pull Requests Releases Activity

use LLC and OPT: the configure options are no longer

Browse Source 
Resolves: rhbz#1918080
This commit is contained in:
Jens Petersen 2021-06-19 14:14:56 +08:00
parent d2d6c8b58c
commit 9904ba9762
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
ghc.spec
View File

@ -443,6 +443,11 @@ autoreconf
# for ghc >= 8.2 # for ghc >= 8.2
export CC=%{_bindir}/gcc 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 induces cross-build due to different target/host/build platform names
./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \ ./configure --prefix=%{_prefix} --exec-prefix=%{_exec_prefix} \
--bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \ --bindir=%{_bindir} --sbindir=%{_sbindir} --sysconfdir=%{_sysconfdir} \
@ -451,11 +456,6 @@ export CC=%{_bindir}/gcc
--sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \ --sharedstatedir=%{_sharedstatedir} --mandir=%{_mandir} \
--docdir=%{_docdir}/ghc \ --docdir=%{_docdir}/ghc \
--with-system-libffi \ --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} %ifarch %{ghc_unregisterized_arches}
--enable-unregisterised \ --enable-unregisterised \
%endif %endif
@ -740,6 +740,7 @@ env -C %{ghc_html_libraries_dir} ./gen_contents_index
%changelog %changelog
* Sat Jun 19 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-112 * Sat Jun 19 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-112
- remove llvm opt-viewer since it uses python2.7 - 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 * Wed Jun 16 2021 Jens Petersen <petersen@redhat.com> - 8.8.4-111
- bundle llvm7.0 on aarch64 (#1918080) - bundle llvm7.0 on aarch64 (#1918080)