Use modern cmake macros
This commit is contained in:
parent
d0c80cfd62
commit
4160844a75
@ -4,7 +4,7 @@
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
#%%global rc_ver 6
|
#%%global rc_ver 6
|
||||||
%global baserelease 5
|
%global baserelease 6
|
||||||
|
|
||||||
%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
|
%global crt_srcdir compiler-rt-%{version}%{?rc_ver:rc%{rc_ver}}.src
|
||||||
|
|
||||||
@ -36,6 +36,7 @@ Patch1: 0001-Fix-strict-aliasing-warning-in-msan.cpp.patch
|
|||||||
BuildRequires: gcc
|
BuildRequires: gcc
|
||||||
BuildRequires: gcc-c++
|
BuildRequires: gcc-c++
|
||||||
BuildRequires: cmake
|
BuildRequires: cmake
|
||||||
|
BuildRequires: ninja-build
|
||||||
BuildRequires: python3
|
BuildRequires: python3
|
||||||
# We need python3-devel for pathfix.py.
|
# We need python3-devel for pathfix.py.
|
||||||
BuildRequires: python3-devel
|
BuildRequires: python3-devel
|
||||||
@ -57,9 +58,7 @@ instrumentation, and Blocks C language extension.
|
|||||||
pathfix.py -i %{__python3} -pn lib/hwasan/scripts/hwasan_symbolize
|
pathfix.py -i %{__python3} -pn lib/hwasan/scripts/hwasan_symbolize
|
||||||
|
|
||||||
%build
|
%build
|
||||||
mkdir -p _build
|
%cmake -GNinja \
|
||||||
cd _build
|
|
||||||
%cmake .. \
|
|
||||||
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
-DCMAKE_BUILD_TYPE=RelWithDebInfo \
|
||||||
-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
|
-DLLVM_CONFIG_PATH:FILEPATH=%{_bindir}/llvm-config-%{__isa_bits} \
|
||||||
\
|
\
|
||||||
@ -70,11 +69,11 @@ cd _build
|
|||||||
%endif
|
%endif
|
||||||
-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF # could be on?
|
-DCOMPILER_RT_INCLUDE_TESTS:BOOL=OFF # could be on?
|
||||||
|
|
||||||
make %{?_smp_mflags}
|
%cmake_build
|
||||||
|
|
||||||
%install
|
%install
|
||||||
cd _build
|
|
||||||
make install DESTDIR=%{buildroot}
|
%cmake_install
|
||||||
|
|
||||||
# move blacklist/abilist files to where clang expect them
|
# move blacklist/abilist files to where clang expect them
|
||||||
mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share
|
mkdir -p %{buildroot}%{_libdir}/clang/%{version}/share
|
||||||
@ -107,7 +106,8 @@ done
|
|||||||
popd
|
popd
|
||||||
|
|
||||||
%check
|
%check
|
||||||
#make check-all -C _build
|
|
||||||
|
#%%cmake_build --target check-compiler-rt
|
||||||
|
|
||||||
%files
|
%files
|
||||||
%{_includedir}/*
|
%{_includedir}/*
|
||||||
@ -117,6 +117,9 @@ popd
|
|||||||
%endif
|
%endif
|
||||||
|
|
||||||
%changelog
|
%changelog
|
||||||
|
* Mon Jul 20 2020 sguelton@redhat.com - 10.0.0-6
|
||||||
|
- Use modern cmake macros
|
||||||
|
|
||||||
* Wed Jul 15 2020 sguelton@redhat.com - 10.0.0-5
|
* Wed Jul 15 2020 sguelton@redhat.com - 10.0.0-5
|
||||||
- Fix multilib runtime links, see rhbz#1855379
|
- Fix multilib runtime links, see rhbz#1855379
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user