From 277bd76c83f8bc9847927bf6e7d279614e7ebf74 Mon Sep 17 00:00:00 2001 From: Tom Stellard Date: Thu, 1 Aug 2019 18:19:20 +0000 Subject: [PATCH] Sync with clang8.0 compat --- clang.spec | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/clang.spec b/clang.spec index da718ff..34a40da 100644 --- a/clang.spec +++ b/clang.spec @@ -4,6 +4,7 @@ %global min_ver 0 %global patch_ver 0 #%%global rc_ver 4 +%global baserelease 4 %global clang_tools_binaries \ %{_bindir}/clangd \ @@ -61,7 +62,7 @@ Name: %pkg_name Version: %{maj_ver}.%{min_ver}.%{patch_ver} -Release: 4%{?rc_ver:.rc%{rc_ver}}%{?dist} +Release: %{baserelease}%{?rc_ver:.rc%{rc_ver}}%{?dist} Summary: A C language family front-end for LLVM License: NCSA @@ -270,7 +271,11 @@ cd _build %endif %endif \ +%if !0%{compat_build} -DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen \ +%else + -DLLVM_TABLEGEN_EXE:FILEPATH=%{_bindir}/llvm-tblgen-%{maj_ver}.%{min_ver} \ +%endif -DCLANG_ENABLE_ARCMT:BOOL=ON \ -DCLANG_ENABLE_STATIC_ANALYZER:BOOL=ON \ -DCLANG_INCLUDE_DOCS:BOOL=ON \