rpms/rust
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Reintroduce the workaround for LLVM library path

Browse Source 
This reverts commit 93ecbc5a13,
reintroducing the workaround for rust#40717, now rust#68714.
This commit is contained in:
Josh Stone 2020-01-31 13:50:52 -08:00
parent b2dedbd4bd
commit a22d8f719c
1 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rust.spec
View File

@ -224,6 +224,10 @@ Requires: /usr/bin/cc
%if "%{llvm_root}" == "%{_prefix}" || 0%{?scl:1}
%global llvm_has_filecheck 1
%endif
%if "%{llvm_root}" != "%{_prefix}"
# https://github.com/rust-lang/rust/issues/68714
%global library_path $(%{llvm_root}/bin/llvm-config --libdir)
%endif
%endif
%description
@ -477,6 +481,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
%endif
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
%{?library_path:export LIBRARY_PATH="%{library_path}"}
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
# We're going to override --libdir when configuring to get rustlib into a
@ -527,6 +532,7 @@ export LIBSSH2_SYS_USE_PKG_CONFIG=1
%install
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
%{?library_path:export LIBRARY_PATH="%{library_path}"}
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
DESTDIR=%{buildroot} %{python} ./x.py install
@ -597,6 +603,7 @@ rm -f %{buildroot}%{rustlibdir}/etc/lldb_*.py*
%check
%{?cmake_path:export PATH=%{cmake_path}:$PATH}
%{?library_path:export LIBRARY_PATH="%{library_path}"}
%{?rustflags:export RUSTFLAGS="%{rustflags}"}
# The results are not stable on koji, so mask errors and just log it.