Skip to content

Commit eb292fb

Browse files
committed
Merge branch 'jb46191' into 'master'
[llvm] Fix build targets. JB#46191 See merge request mer-core/llvm!5
2 parents 5ad2ebf + 388af61 commit eb292fb

File tree

2 files changed

+13
-24
lines changed

2 files changed

+13
-24
lines changed

rpm/LLVMBuild.txt

Lines changed: 0 additions & 21 deletions
This file was deleted.

rpm/llvm.spec

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,15 @@
1+
%ifarch %ix86 x86_64
2+
# ARM/AARCH64 enabled due to rhbz#1627500
3+
#global llvm_targets X86;AMDGPU;NVPTX;BPF;ARM;AArch64
4+
%global llvm_targets X86;AMDGPU;NVPTX;BPF
5+
%endif
6+
%ifarch aarch64
7+
%global llvm_targets AArch64;AMDGPU;BPF
8+
%endif
9+
%ifarch %{arm}
10+
%global llvm_targets ARM;AMDGPU;BPF
11+
%endif
12+
113
Name: llvm
214
Version: 7.0.1
315
Release: 0
@@ -6,7 +18,6 @@ License: University of Illinois/NCSA Open Source License
618
Group: Development/Tools
719
URL: http://llvm.org/
820
Source: %{version}/%{name}-%{version}.tar.gz
9-
Source1: LLVMBuild.txt
1021
Patch1: nosse4-avx.patch
1122
Requires(post): /sbin/ldconfig
1223
Requires(postun): /sbin/ldconfig
@@ -33,7 +44,6 @@ LLVM Header files
3344

3445
%prep
3546
%setup -q -n %{name}-%{version}/%{name}/llvm
36-
cp %{_sourcedir}/LLVMBuild.txt projects/
3747

3848
%build
3949

@@ -52,7 +62,7 @@ pushd build
5262
-DLLVM_INCLUDE_EXAMPLES:BOOL=OFF \
5363
-DLLVM_INCLUDE_TEST:BOOL=OFF \
5464
-DLLVM_LINK_LLVM_DYLIB:BOOL=OFF \
55-
-DLLVM_TARGETS_TO_BUILD=Native \
65+
-DLLVM_TARGETS_TO_BUILD="%{llvm_targets}" \
5666
-DLLVM_TOOLS_BINARY_DIR:PATH=%{_bindir}
5767

5868
# Jobs limited to 4 to prevent OBS from running out of memory

0 commit comments

Comments
 (0)