From 6c1561bcc65529140a467218193ef97edc3bd2ed Mon Sep 17 00:00:00 2001 From: luofeng14 Date: Thu, 11 Apr 2024 20:48:05 +0800 Subject: [PATCH] support clang build (cherry picked from commit 86bd7b0e285353c0d23accdbaa514f14d501a8a8) --- lcr.spec | 16 +++++++++++++--- 1 file changed, 13 insertions(+), 3 deletions(-) diff --git a/lcr.spec b/lcr.spec index 0454cdc..e157857 100644 --- a/lcr.spec +++ b/lcr.spec @@ -1,5 +1,5 @@ %global _version 2.1.4 -%global _release 5 +%global _release 6 %global _inner_name isula_libutils %global enable_lxc 1 @@ -72,10 +72,14 @@ the libisula-devel package contains json, log and utils headers for developing p %build mkdir -p build cd build +%if "%toolchain" == "clang" +%global cmake_opts -DCMAKE_C_FLAGS="${CFLAGS}" +%endif + %if 0%{?enable_lxc} -%cmake -DDEBUG=ON -DENABLE_LIBLCR=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} ../ +%cmake -DDEBUG=ON -DENABLE_LIBLCR=ON -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} %{?cmake_opts} ../ %else -%cmake -DDEBUG=ON -DENABLE_LIBLCR=OFF -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} ../ +%cmake -DDEBUG=ON -DENABLE_LIBLCR=OFF -DCMAKE_SKIP_RPATH=TRUE -DLIB_INSTALL_DIR=%{_libdir} %{?cmake_opts} ../ %endif %make_build @@ -137,6 +141,12 @@ rm -rf %{buildroot} %{_includedir}/lcr/utils_compile.h %changelog +* Fri Apr 12 2024 luofeng - 2.1.4-6 +- Type:enhancement +- CVE:NA +- SUG:NA +- DESC:support clang build + * Thu Apr 11 2024 jikai - 2.1.4-5 - Type:enhancement - CVE:NA