Fix build_libddir

This commit is contained in:
Nikita Popov 2024-07-31 13:54:15 +00:00 committed by Timm Bäder
parent 8e0f66c2d2
commit 593bda8820
3 changed files with 3 additions and 3 deletions

View file

@ -32,7 +32,7 @@ export ASMFLAGS="%{build_cflags}"
#endregion #endregion
export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:`pwd`/llvm/%{_vpath_builddir}/%{_lib}" export LD_LIBRARY_PATH="${LD_LIBRARY_PATH}:`pwd`/%{build_libdir}"
cd llvm cd llvm

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 build_libdir llvm/%{_vpath_builddir}/lib
%global pkg_includedir %{_includedir}/%{pkg_name_llvm} %global pkg_includedir %{_includedir}/%{pkg_name_llvm}
%global pkg_datadir %{install_prefix}/share %global pkg_datadir %{install_prefix}/share
@ -68,6 +69,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 build_libdir llvm/%{_vpath_builddir}/%{_lib}
%global pkg_datadir %{_datadir} %global pkg_datadir %{_datadir}
%global pkg_suffix %{nil} %global pkg_suffix %{nil}
%global exec_suffix %{nil} %global exec_suffix %{nil}

View file

@ -26,8 +26,6 @@ do
done done
# Install libraries needed for unittests # Install libraries needed for unittests
%global build_libdir llvm/%{_vpath_builddir}/%{_lib}
install %{build_libdir}/libLLVMTestingSupport.a %{buildroot}%{install_libdir} install %{build_libdir}/libLLVMTestingSupport.a %{buildroot}%{install_libdir}
install %{build_libdir}/libLLVMTestingAnnotations.a %{buildroot}%{install_libdir} install %{build_libdir}/libLLVMTestingAnnotations.a %{buildroot}%{install_libdir}