Revert "Change build generator to ninja"

This reverts commit 9994d03c238403e5e82c8319cb76cebc573988d9.

Change-Id: I3ec547fe9d0da2ecd5e37d14b91ba633f60a021e

diff --git a/.gitignore b/.gitignore
deleted file mode 100644 (file)
index 1d1e8cc..0000000
--- a/.gitignore
+++ /dev/null
@@ -1,9 +0,0 @@
-build
-_build
-packaging/llvm-*.tar.gz
-debugfiles.list
-debuglinks.list
-debugsources.list
-llvm-debuginfo.manifest
-llvm-debugsource.manifest
-llvm.manifest

diff --git a/packaging/llvm.spec b/packaging/llvm.spec
index 59a5959..b9e4a31 100644 (file)
--- a/packaging/llvm.spec
+++ b/packaging/llvm.spec
@@ -14,7 +14,6 @@ Source1001: llvm.manifest
 ExcludeArch: aarch64
 
 BuildRequires: cmake
-BuildRequires: ninja
 BuildRequires: python
 BuildRequires: python-devel
 BuildRequires: patchelf
@@ -138,8 +137,8 @@ cp %{SOURCE1001} .
 %ifarch %ix86
 %{?asan:%gcc_unforce_options}
 %endif
-mkdir -p _build
-cd _build
+mkdir -p build
+cd build
 cmake -G Ninja \
     -DCMAKE_C_COMPILER=/usr/bin/gcc \
     -DCMAKE_CXX_COMPILER=/usr/bin/g++ \
@@ -172,11 +171,11 @@ cmake -G Ninja \
     -DLLVM_BINUTILS_INCDIR=/usr/include \
     ../llvm
 
-ninja %{?jobs:-j%jobs}
+make %{?jobs:-j%jobs}
 
 %install
-cd _build
-DESTDIR=%{?buildroot:%{buildroot}} INSTALL_ROOT=%{?buildroot:%{buildroot}} ninja install
+cd build
+%make_install
 ln -sf %{install_prefix}/bin/clang++ %{buildroot}%{install_prefix}/bin/clang++-%{llvm_version}
 
 mkdir -p %{buildroot}%{bindir}