From 93ecbc5a139208a2eeff691980d8e513b6b1b406 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Mon, 25 Mar 2019 15:45:14 -0700 Subject: [PATCH] Remove the workaround for rust#40717 --- rust.spec | 7 ------- 1 file changed, 7 deletions(-) diff --git a/rust.spec b/rust.spec index b65ac64..3df6d3e 100644 --- a/rust.spec +++ b/rust.spec @@ -229,10 +229,6 @@ 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/40717 -%global library_path $(%{llvm_root}/bin/llvm-config --libdir) -%endif %endif %description @@ -468,7 +464,6 @@ 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 @@ -510,7 +505,6 @@ 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 @@ -579,7 +573,6 @@ 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.