diff --git a/build.spec.inc b/build.spec.inc index 1f5a351..38a9da0 100644 --- a/build.spec.inc +++ b/build.spec.inc @@ -32,7 +32,7 @@ export ASMFLAGS="%{build_cflags}" #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 diff --git a/globals.spec.inc b/globals.spec.inc index a0e926c..6102ec6 100644 --- a/globals.spec.inc +++ b/globals.spec.inc @@ -56,6 +56,7 @@ %global install_datadir %{install_prefix}/share %global install_libexecdir %{install_prefix}/libexec %global install_docdir %{install_datadir}/doc +%global build_libdir llvm/%{_vpath_builddir}/lib %global pkg_includedir %{_includedir}/%{pkg_name_llvm} %global pkg_datadir %{install_prefix}/share @@ -68,6 +69,7 @@ %global install_includedir %{_includedir} %global install_libexecdir %{_libexecdir} %global install_docdir %{_docdir} +%global build_libdir llvm/%{_vpath_builddir}/%{_lib} %global pkg_datadir %{_datadir} %global pkg_suffix %{nil} %global exec_suffix %{nil} diff --git a/install.spec.inc b/install.spec.inc index 58f760e..3c87284 100644 --- a/install.spec.inc +++ b/install.spec.inc @@ -26,8 +26,6 @@ do done # Install libraries needed for unittests -%global build_libdir llvm/%{_vpath_builddir}/%{_lib} - install %{build_libdir}/libLLVMTestingSupport.a %{buildroot}%{install_libdir} install %{build_libdir}/libLLVMTestingAnnotations.a %{buildroot}%{install_libdir}