rpms/rust
5
0
Fork 0
Code Issues Pull Requests Releases Activity

Remove the workaround for rust#40717

Browse Source
This commit is contained in:
Josh Stone 2019-03-25 15:45:14 -07:00
parent f712684d1b
commit 93ecbc5a13
1 changed files with 0 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
rust.spec
View File

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