From: Jan Kratochvil <jan.kratochvil@redhat.com>
Date: Wed, 22 Jul 2020 07:50:14 +0000 (+0200)
Subject: (no commit message)
X-Git-Url: https://git.jankratochvil.net/?p=lldb-experimental.git;a=commitdiff_plain;h=2c4a18b6f3666b248dfc6a4cfbb5e040776298ee

---

diff --git a/lldb-experimental.spec b/lldb-experimental.spec
index 2b090a9..57c84cc 100644
--- a/lldb-experimental.spec
+++ b/lldb-experimental.spec
@@ -12,7 +12,7 @@
 %endif
 Name: lldb-experimental
 Version: 11.0.0
-Release: 0.20200721snap2%{?dist}
+Release: 0.20200722snap0%{?dist}
 Summary: Next generation high-performance debugger - experimental trunk snapshot
 License: NCSA
 URL: http://lldb.llvm.org/
@@ -94,9 +94,6 @@ git -c merge.renameLimit=1 merge jankratochvil/rust
 %patch1 -p1
 
 %build
-mkdir build-release
-cd    build-release
-
 FLAGS="%{optflags}"
 
 # lldb/scripts/LLDBWrapPython.cpp:23699:70: error: format not a string literal and no format arguments [-Werror=format-security]
@@ -125,8 +122,8 @@ CXXFLAGS="$FLAGS"
 # It does not work: -DDCMAKE_EXECUTABLE_SUFFIX=-experimental
 # -fdebug-types-section && -DLLVM_USE_LINKER=gold:
 # ../../../../lib64/libclangLex.a(PreprocessingRecord.cpp.o)(.debug_types+0xfe): error: undefined reference to 'clang::SourceRange::getBegin() const'
-%cmake ../llvm \
-  -DCMAKE_INSTALL_PREFIX=%{buildroot}%{pkg_prefix} \
+%cmake llvm \
+  -DCMAKE_INSTALL_PREFIX=%{pkg_prefix} \
   -DBUILD_SHARED_LIBS=OFF \
 %if %{fast}
   -DCMAKE_BUILD_TYPE=Release \
@@ -147,9 +144,7 @@ CXXFLAGS="$FLAGS"
   -DLLDB_DISABLE_LIBEDIT=OFF \
   -DLLDB_DISABLE_PYTHON=OFF \
   #
-# Only Rawhide cmake creates this subdirectory.
-cd *-redhat-linux-gnu || :
-%make_build
+%cmake_build
 
 %install
 mkdir -p %{buildroot}%{pkg_prefix}
@@ -164,10 +159,7 @@ mkdir -p %{buildroot}%{pkg_prefix}
  revline . jankratochvil/rust
 %endif
 ) >%{buildroot}%{pkg_prefix}/HEAD
-cd build-release
-# Only Rawhide cmake creates this subdirectory.
-cd *-redhat-linux-gnu || :
-%make_install
+%cmake_install
 mkdir -p %{buildroot}%{_bindir}
 # lldb-mi
 for i in lldb;do