From 2e9a258bc16bcc259e5d078183753aa9d4e2de34 Mon Sep 17 00:00:00 2001 From: Josh Stone Date: Wed, 22 Mar 2017 13:18:56 -0700 Subject: [PATCH] cmake is only needed for bundled llvm --- rust.spec | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/rust.spec b/rust.spec index 85fa005..fc1f50a 100644 --- a/rust.spec +++ b/rust.spec @@ -120,13 +120,12 @@ BuildRequires: zlib-devel BuildRequires: python2 BuildRequires: curl +%if %with bundled_llvm %if 0%{?epel} BuildRequires: cmake3 %else BuildRequires: cmake %endif - -%if %with bundled_llvm Provides: bundled(llvm) = 3.9 %else BuildRequires: llvm-devel >= 3.7 @@ -268,7 +267,7 @@ sed -i.jemalloc -e '1i // ignore-test jemalloc is disabled' \ src/test/compile-fail/allocator-rust-dylib-is-jemalloc.rs \ src/test/run-pass/allocator-default.rs -%if 0%{?epel} +%if %{with bundled_llvm} && 0%{?epel} mkdir -p cmake-bin ln -s /usr/bin/cmake3 cmake-bin/cmake %global cmake_path $PWD/cmake-bin