From e1164bd8c72b3c32bb972146acf353297f68ac4f Mon Sep 17 00:00:00 2001
From: liquor <1692257904@qq.com>
Date: Tue, 18 Aug 2020 16:07:14 +0800
Subject: [PATCH] Use -DLLVM_TARGETS_TO_BUILD=all in configure

---
 llvm.spec | 36 +++++++++++++++++++++++++-----------
 1 file changed, 25 insertions(+), 11 deletions(-)

diff --git a/llvm.spec b/llvm.spec
index e222571..fa58e26 100644
--- a/llvm.spec
+++ b/llvm.spec
@@ -1,6 +1,6 @@
 Name:		llvm
 Version:	10.0.1
-Release:        1
+Release:        2
 Summary:	The Low Level Virtual Machine
 License:	NCSA
 URL:		http://llvm.org
@@ -58,12 +58,16 @@ The %{name}-help package contains doc files for %{name}.
 pathfix.py -i %{__python3} -pn test/BugPoint/compile-custom.ll.py tools/opt-viewer/*.py
 
 %build
+#TODO: -DLLVM_TARGETS_TO_BUILD=all in needed(temporarily) when build rust,
+#      clarification is required in the future
 mkdir -p _build
 cd _build
 %global optflags %(echo %{optflags} | sed 's/-g /-g1 /')
 %cmake .. -G Ninja \
 	-DBUILD_SHARED_LIBS:BOOL=OFF \
+	-DLLVM_PARALLEL_LINK_JOBS=1 \
 	-DCMAKE_BUILD_TYPE=RelWithDebInfo \
+	-DCMAKE_INSTALL_RPATH=";" \
 	-DCMAKE_C_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 	-DCMAKE_CXX_FLAGS_RELWITHDEBINFO="%{optflags} -DNDEBUG" \
 %if 0%{?__isa_bits} == 64
@@ -71,6 +75,7 @@ cd _build
 %else
 	-DLLVM_LIBDIR_SUFFIX= \
 %endif
+%if 0
 %ifarch %ix86 x86_64
 	-DLLVM_TARGETS_TO_BUILD="X86;AMDGPU;NVPTX;BPF;ARM;AArch64" \
 %endif
@@ -80,11 +85,14 @@ cd _build
 %ifarch %{arm}
 	-DLLVM_TARGETS_TO_BUILD="ARM;AMDGPU;BPF" \
 %endif
+%endif
+	-DLLVM_TARGETS_TO_BUILD=all \
 	-DLLVM_ENABLE_LIBCXX:BOOL=OFF \
 	-DLLVM_ENABLE_ZLIB:BOOL=ON \
 	-DLLVM_ENABLE_FFI:BOOL=ON \
 	-DLLVM_ENABLE_RTTI:BOOL=ON \
 	-DLLVM_BINUTILS_INCDIR=%{_includedir} \
+	-DLLVM_EXPERIMENTAL_TARGETS_TO_BUILD=AVR \
 	-DLLVM_BUILD_RUNTIME:BOOL=ON \
 	-DLLVM_INCLUDE_TOOLS:BOOL=ON \
 	-DLLVM_BUILD_TOOLS:BOOL=ON \
@@ -94,40 +102,39 @@ cd _build
 	-DLLVM_BUILD_EXAMPLES:BOOL=OFF \
 	-DLLVM_INCLUDE_UTILS:BOOL=ON \
 	-DLLVM_INSTALL_UTILS:BOOL=ON \
-	-DLLVM_UTILS_INSTALL_DIR:PATH=%{buildroot}%{_libdir}/%{name} \
+	-DLLVM_UTILS_INSTALL_DIR:PATH=%{_bindir} \
+	-DLLVM_TOOLS_INSTALL_DIR:PATH=bin \
 	-DLLVM_INCLUDE_DOCS:BOOL=ON \
 	-DLLVM_BUILD_DOCS:BOOL=ON \
 	-DLLVM_ENABLE_SPHINX:BOOL=ON \
 	-DLLVM_ENABLE_DOXYGEN:BOOL=OFF \
+	-DLLVM_VERSION_SUFFIX='' \
 	-DLLVM_BUILD_LLVM_DYLIB:BOOL=ON \
 	-DLLVM_DYLIB_EXPORT_ALL:BOOL=ON \
 	-DLLVM_LINK_LLVM_DYLIB:BOOL=ON \
 	-DLLVM_BUILD_EXTERNAL_COMPILER_RT:BOOL=ON \
 	-DLLVM_INSTALL_TOOLCHAIN_ONLY:BOOL=OFF \
 	-DSPHINX_WARNINGS_AS_ERRORS=OFF \
-	-DCMAKE_INSTALL_PREFIX=%{buildroot}/usr \
-	-DLLVM_INSTALL_SPHINX_HTML_DIR=%{buildroot}%{_pkgdocdir}/html \
+	-DLLVM_INSTALL_SPHINX_HTML_DIR=%{_pkgdocdir}/html \
 	-DSPHINX_EXECUTABLE=%{_bindir}/sphinx-build-3
 
-ninja -v
+%ninja_build LLVM
+%ninja_build
 
 %install
-cd _build
-ninja -v install
+%ninja_install -C _build
 
 find %{buildroot}%{_libdir}/cmake/llvm -type f | xargs sed -i "s|%{buildroot}||g"
 mv -v %{buildroot}%{_bindir}/llvm-config{,-%{__isa_bits}}
 
-for f in lli-child-target llvm-isel-fuzzer llvm-opt-fuzzer yaml-bench; do
-install -m 0755 ./bin/$f %{buildroot}%{_libdir}/%{name}
+for f in llvm-isel-fuzzer llvm-opt-fuzzer; do
+install -m 0755 ./_build/bin/$f %{buildroot}%{_bindir}
 done
 
 %global install_srcdir %{buildroot}%{_datadir}/llvm/src
 %global lit_cfg test/lit.site.cfg.py
 %global lit_unit_cfg test/Unit/lit.site.cfg.py
 
-cd ..
-
 install -d %{install_srcdir}
 install -d %{install_srcdir}/utils/
 cp -R utils/unittest %{install_srcdir}/utils/
@@ -143,6 +150,7 @@ install -d %{buildroot}%{_libexecdir}/tests/llvm
 install -d %{buildroot}%{_datadir}/llvm/
 tar -czf %{install_srcdir}/test.tar.gz test/
 
+mkdir -p %{buildroot}%{_libdir}/%{name}
 cp -R _build/unittests %{buildroot}%{_libdir}/%{name}/
 find %{buildroot}%{_libdir}/%{name} -ignore_readdir_race -iname 'cmake*' -exec rm -Rf '{}' ';' || true
 
@@ -193,6 +201,12 @@ fi
 %{_mandir}/man1/*
 
 %changelog
+* Tue Aug 18 2020 Liquor <lirui130@huawei.com> - 10.0.1-2
+- Type: bugfix
+- ID: NA
+- SUG: NA
+- DESC:Use -DLLVM_TARGETS_TO_BUILD=all in configure
+
 * Tue Jul 28 2020 Liquor <lirui130@huawei.com> - 10.0.1-1
 - Type: update
 - ID: NA
-- 
Gitee