From d27298c476fa573202eee71d2a4017a815e94d70 Mon Sep 17 00:00:00 2001 From: luofeng14 Date: Wed, 23 Aug 2023 08:11:41 +0000 Subject: [PATCH] clang build bugfix Signed-off-by: luofeng14 --- kernel.spec | 52 ++++++++++++++++++++++++++-------------------------- 1 file changed, 26 insertions(+), 26 deletions(-) diff --git a/kernel.spec b/kernel.spec index fe393ed..e8993d9 100644 --- a/kernel.spec +++ b/kernel.spec @@ -349,12 +349,12 @@ sed -i arch/arm64/configs/openeuler_defconfig -e 's/^CONFIG_ARM64_VA_BITS_.*/CON %global Clang_Make_Option LLVM=1 LLVM_IAS=1 HOSTLD=ld LD=ld %endif -make %{Clang_Make_Option} ARCH=%{Arch} openeuler_defconfig +make %{?Clang_Make_Option} ARCH=%{Arch} openeuler_defconfig TargetImage=$(basename $(make -s image_name)) -make %{Clang_Make_Option} ARCH=%{Arch} $TargetImage %{?_smp_mflags} -make %{Clang_Make_Option} ARCH=%{Arch} modules %{?_smp_mflags} +make %{?Clang_Make_Option} ARCH=%{Arch} $TargetImage %{?_smp_mflags} +make %{?Clang_Make_Option} ARCH=%{Arch} modules %{?_smp_mflags} %if 0%{?with_kabichk} chmod 0755 %{SOURCE18} @@ -368,7 +368,7 @@ make %{Clang_Make_Option} ARCH=%{Arch} modules %{?_smp_mflags} # make dtbs %ifarch aarch64 riscv64 - make %{Clang_Make_Option} ARCH=%{Arch} dtbs + make %{?Clang_Make_Option} ARCH=%{Arch} dtbs %endif ## make tools @@ -376,7 +376,7 @@ make %{Clang_Make_Option} ARCH=%{Arch} modules %{?_smp_mflags} # perf %if "%toolchain" == "clang" %global perf_make \ - make %{Clang_Make_Option} EXTRA_CFLAGS="-g -Wall -fstack-protector-strong -fPIC" EXTRA_LDFLAGS="-z now" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 prefix=%{_prefix} + make %{?Clang_Make_Option} EXTRA_CFLAGS="-g -Wall -fstack-protector-strong -fPIC" EXTRA_LDFLAGS="-z now" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 prefix=%{_prefix} %else %global perf_make \ make EXTRA_CFLAGS="-Wl,-z,now -g -Wall -fstack-protector-strong -fPIC" EXTRA_PERFLIBS="-fpie -pie" %{?_smp_mflags} -s V=1 WERROR=0 NO_LIBUNWIND=1 HAVE_CPLUS_DEMANGLE=1 NO_GTK2=1 NO_LIBNUMA=1 NO_STRLCPY=1 prefix=%{_prefix} @@ -405,45 +405,45 @@ popd # bpftool pushd tools/bpf/bpftool -make %{Clang_Make_Option} +make %{?Clang_Make_Option} popd # cpupower chmod +x tools/power/cpupower/utils/version-gen.sh -make %{Clang_Make_Option} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false +make %{?Clang_Make_Option} %{?_smp_mflags} -C tools/power/cpupower CPUFREQ_BENCH=false %ifarch %{ix86} pushd tools/power/cpupower/debug/i386 - make %{Clang_Make_Option} %{?_smp_mflags} centrino-decode powernow-k8-decode + make %{?Clang_Make_Option} %{?_smp_mflags} centrino-decode powernow-k8-decode popd %endif %ifarch x86_64 pushd tools/power/cpupower/debug/x86_64 - make %{Clang_Make_Option} %{?_smp_mflags} centrino-decode powernow-k8-decode + make %{?Clang_Make_Option} %{?_smp_mflags} centrino-decode powernow-k8-decode popd %endif %ifarch %{ix86} x86_64 pushd tools/power/x86/x86_energy_perf_policy/ - make %{Clang_Make_Option} + make %{?Clang_Make_Option} popd pushd tools/power/x86/turbostat - make %{Clang_Make_Option} + make %{?Clang_Make_Option} popd %endif # thermal pushd tools/thermal/tmon/ -make %{Clang_Make_Option} +make %{?Clang_Make_Option} popd # iio pushd tools/iio/ -make %{Clang_Make_Option} +make %{?Clang_Make_Option} popd # gpio pushd tools/gpio/ -make %{Clang_Make_Option} +make %{?Clang_Make_Option} popd # kvm pushd tools/kvm/kvm_stat/ -make %{Clang_Make_Option} %{?_smp_mflags} man +make %{?Clang_Make_Option} %{?_smp_mflags} man popd %install @@ -486,7 +486,7 @@ install -m 755 %{SOURCE200} $RPM_BUILD_ROOT%{_sbindir}/mkgrub-menu-%{devel_relea %endif # deal with module, if not kdump -make %{Clang_Make_Option} ARCH=%{Arch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=%{KernelVer} mod-fw= +make %{?Clang_Make_Option} ARCH=%{Arch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT modules_install KERNELRELEASE=%{KernelVer} mod-fw= ######## to collect ko to module.filelist about netwoking. block. drm. modesetting ############### pushd $RPM_BUILD_ROOT/lib/modules/%{KernelVer} find -type f -name "*.ko" >modnames @@ -548,7 +548,7 @@ popd %{nil} # deal with header -make %{Clang_Make_Option} ARCH=%{Arch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install +make %{?Clang_Make_Option} ARCH=%{Arch} INSTALL_HDR_PATH=$RPM_BUILD_ROOT/usr KBUILD_SRC= headers_install find $RPM_BUILD_ROOT/usr/include -name "\.*" -exec rm -rf {} \; # dtbs install @@ -559,7 +559,7 @@ find $RPM_BUILD_ROOT/usr/include -name "\.*" -exec rm -rf {} \; %endif # deal with vdso -make %{Clang_Make_Option} -s ARCH=%{Arch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=%{KernelVer} +make %{?Clang_Make_Option} -s ARCH=%{Arch} INSTALL_MOD_PATH=$RPM_BUILD_ROOT vdso_install KERNELRELEASE=%{KernelVer} if [ ! -s ldconfig-kernel.conf ]; then echo "# Placeholder file, no vDSO hwcap entries used in this kernel." >ldconfig-kernel.conf fi @@ -672,10 +672,10 @@ install -pm0644 tools/perf/Documentation/*.1 %{buildroot}/%{_mandir}/man1/ # bpftool pushd tools/bpf/bpftool -make %{Clang_Make_Option} DESTDIR=%{buildroot} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install doc-install +make %{?Clang_Make_Option} DESTDIR=%{buildroot} prefix=%{_prefix} bash_compdir=%{_sysconfdir}/bash_completion.d/ mandir=%{_mandir} install doc-install popd # cpupower -make %{Clang_Make_Option} -C tools/power/cpupower DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install +make %{?Clang_Make_Option} -C tools/power/cpupower DESTDIR=%{buildroot} libdir=%{_libdir} mandir=%{_mandir} CPUFREQ_BENCH=false install rm -f %{buildroot}%{_libdir}/*.{a,la} %find_lang cpupower mv cpupower.lang ../ @@ -698,27 +698,27 @@ install -m644 %{SOURCE2001} %{buildroot}%{_sysconfdir}/sysconfig/cpupower %ifarch %{ix86} x86_64 mkdir -p %{buildroot}%{_mandir}/man8 pushd tools/power/x86/x86_energy_perf_policy - make %{Clang_Make_Option} DESTDIR=%{buildroot} install + make %{?Clang_Make_Option} DESTDIR=%{buildroot} install popd pushd tools/power/x86/turbostat - make %{Clang_Make_Option} DESTDIR=%{buildroot} install + make %{?Clang_Make_Option} DESTDIR=%{buildroot} install popd %endif # thermal pushd tools/thermal/tmon -make %{Clang_Make_Option} INSTALL_ROOT=%{buildroot} install +make %{?Clang_Make_Option} INSTALL_ROOT=%{buildroot} install popd # iio pushd tools/iio -make %{Clang_Make_Option} DESTDIR=%{buildroot} install +make %{?Clang_Make_Option} DESTDIR=%{buildroot} install popd # gpio pushd tools/gpio -make %{Clang_Make_Option} DESTDIR=%{buildroot} install +make %{?Clang_Make_Option} DESTDIR=%{buildroot} install popd # kvm pushd tools/kvm/kvm_stat -make %{Clang_Make_Option} INSTALL_ROOT=%{buildroot} install-tools +make %{?Clang_Make_Option} INSTALL_ROOT=%{buildroot} install-tools popd %define __spec_install_post\ -- Gitee