From 5a409b6e9f9aad6053d0f60f82494dddc42aec66 Mon Sep 17 00:00:00 2001
From: Suyun114 <ziyu.oerv@isrc.iscas.ac.cn>
Date: Fri, 24 Jan 2025 09:58:58 +0800
Subject: [PATCH] Fix build errors with Clang

---
 gnu-efi.spec | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/gnu-efi.spec b/gnu-efi.spec
index e26b1b8..99266ad 100644
--- a/gnu-efi.spec
+++ b/gnu-efi.spec
@@ -1,7 +1,7 @@
 %define debug_package %{nil}
 Name:          gnu-efi
 Version:       3.0.18
-Release:       1
+Release:       2
 Summary:       Development Libraries and headers for EFI
 Epoch:         1
 License:       BSD
@@ -31,6 +31,10 @@ Patch2:        riscv64-fix-efibind.h-missing-duplicate-types.patch
 %global efiarch riscv64
 %endif
 
+%if "%{?toolchain}" == "clang"
+%global make_opts CC=clang CXX=clang++
+%endif
+
 Provides:  %{name}-utils = %{epoch}:%{version}-%{release}
 Obsoletes: %{name}-utils < %{epoch}:%{version}-%{release}
 BuildRequires:  gcc make binutils 
@@ -57,13 +61,13 @@ install -Dp %{SOURCE1} gnuefi/gnu/
 %build
 unset LDFLAGS
 
-make
-make apps
+make %{?make_opts}
+make %{?make_opts} apps
 
 %install
 install -d %{buildroot}/%{_libdir}/gnuefi
 install -d %{buildroot}/boot/efi/EFI/%{efidir}/%{efiarch}
-make PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} install
+make %{?make_opts} PREFIX=%{_prefix} LIBDIR=%{_libdir} INSTALLROOT=%{buildroot} install
 mv %{buildroot}/%{_libdir}/*.lds %{buildroot}/%{_libdir}/*.o %{buildroot}/%{_libdir}/gnuefi
 mv %{efiarch}/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidir}/%{efiarch}/
 
@@ -78,6 +82,9 @@ mv %{efiarch}/apps/{route80h.efi,modelist.efi} %{buildroot}/boot/efi/EFI/%{efidi
 %{_includedir}/efi
 
 %changelog
+* Fri Jan 24 2025 Suyun <ziyu.oerv@isrc.iscas.ac.cn> - 1:3.0.18-2
+- Fix build errors with Clang
+
 * Wed Dec 04 2024 zhang_wenyu1 <zhang_wenyu@hoperun.com> - 1:3.0.18-1
 - Upgrade to version 3.0.18
 
-- 
Gitee