rpms/llvm
7
0
Fork 0
mirror of https://src.fedoraproject.org/rpms/llvm.git synced 2024-12-01 03:32:55 +00:00
Code Issues 5 Projects Releases Packages Wiki Activity Actions

Fix libomp libdir

Browse source
This commit is contained in:
Nikita Popov 2024-08-01 13:23:10 +00:00
parent 653d3f17d2
commit 30cfa100b5
2 changed files with 4 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
build.spec.inc
View file

@ -51,8 +51,6 @@ popd
# TODO(kkleine): Follow more closely the Distribution guidelines found here: https://llvm.org/docs/BuildingADistribution.html # TODO(kkleine): Follow more closely the Distribution guidelines found here: https://llvm.org/docs/BuildingADistribution.html
# force off shared libs as cmake macros turns it on. # force off shared libs as cmake macros turns it on.
# TODO: Disable LLVM_UNREACHABLE_OPTIMIZE. # TODO: Disable LLVM_UNREACHABLE_OPTIMIZE.
# TODO: Override LIBOMP_INSTALL_LIBDIR, because otherwise the libraries
# are installed to /usr/lib64/$TRIPLE and clang can't find them.
%cmake -G Ninja \ %cmake -G Ninja \
-DLLVM_ENABLE_PROJECTS="%{projects}" \ -DLLVM_ENABLE_PROJECTS="%{projects}" \
\ \
@ -101,15 +99,8 @@ popd
\ \
\ \
-DLIBOMP_INSTALL_ALIASES=OFF \ -DLIBOMP_INSTALL_ALIASES=OFF \
%if %{without compat_build} -DOPENMP_INSTALL_LIBDIR=%{unprefixed_libdir} \
%if 0%{?__isa_bits} == 64 -DOFFLOAD_INSTALL_LIBDIR=%{unprefixed_libdir} \
-DOPENMP_LIBDIR_SUFFIX=64 \
%else
-DOPENMP_LIBDIR_SUFFIX= \
%endif
%endif
-DOPENMP_INSTALL_LIBDIR=%{_lib} \
-DOFFLOAD_INSTALL_LIBDIR=%{_lib} \
\ \
\ \
\ \

2
globals.spec.inc
View file

@ -56,6 +56,7 @@
%global install_datadir %{install_prefix}/share %global install_datadir %{install_prefix}/share
%global install_libexecdir %{install_prefix}/libexec %global install_libexecdir %{install_prefix}/libexec
%global install_docdir %{install_datadir}/doc %global install_docdir %{install_datadir}/doc
%global unprefixed_libdir lib
%global build_libdir llvm/%{_vpath_builddir}/lib %global build_libdir llvm/%{_vpath_builddir}/lib
%global pkg_includedir %{_includedir}/%{pkg_name_llvm} %global pkg_includedir %{_includedir}/%{pkg_name_llvm}
@ -69,6 +70,7 @@
%global install_includedir %{_includedir} %global install_includedir %{_includedir}
%global install_libexecdir %{_libexecdir} %global install_libexecdir %{_libexecdir}
%global install_docdir %{_docdir} %global install_docdir %{_docdir}
%global unprefixed_libdir %{_lib}
%global build_libdir llvm/%{_vpath_builddir}/%{_lib} %global build_libdir llvm/%{_vpath_builddir}/%{_lib}
%global pkg_datadir %{_datadir} %global pkg_datadir %{_datadir}
%global pkg_suffix %{nil} %global pkg_suffix %{nil}