From bab6890a5fc71ca6c2e64a5ab6ddc2af07fcddf8ad424352391684eb25873441 Mon Sep 17 00:00:00 2001
From: Aaron Puchert <aaronpuchert@alice-dsl.net>
Date: Sun, 4 Feb 2024 20:52:34 +0000
Subject: [PATCH] - Use %_target_* for determining the compiler host triple
 (boo#1218701)

OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm14?expand=0&rev=57
---
 llvm14.changes |  5 +++++
 llvm14.spec    | 18 +++++++++---------
 2 files changed, 14 insertions(+), 9 deletions(-)

diff --git a/llvm14.changes b/llvm14.changes
index 3715bbf..3d68aa7 100644
--- a/llvm14.changes
+++ b/llvm14.changes
@@ -1,3 +1,8 @@
+-------------------------------------------------------------------
+Thu Jan 11 07:38:12 UTC 2024 - Fabian Vogt <fvogt@suse.com>
+
+- Use %_target_* for determining the compiler host triple (boo#1218701)
+
 -------------------------------------------------------------------
 Thu Nov 30 22:53:03 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>
 
diff --git a/llvm14.spec b/llvm14.spec
index c4c4ed1..eb8170c 100644
--- a/llvm14.spec
+++ b/llvm14.spec
@@ -1,7 +1,7 @@
 #
 # spec file for package llvm14
 #
-# Copyright (c) 2023 SUSE LLC
+# Copyright (c) 2024 SUSE LLC
 #
 # All modifications and additions to the file contributed by third parties
 # remain the property of their copyright owners, unless otherwise agreed
@@ -69,15 +69,15 @@
 # Figure out the host triple.
 %ifarch armv6hl
 # See https://build.opensuse.org/request/show/968066.
-%define host_cpu armv6kz
+%define target_cpu armv6kz
 %else
-%define host_cpu %{_host_cpu}
+%define target_cpu %{_target_cpu}
 %endif
 
 %ifarch %{arm}
-%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-gnueabihf
+%define host_triple %{target_cpu}-%{_target_vendor}-%{_target_os}-gnueabihf
 %else
-%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}
+%define host_triple %{target_cpu}-%{_target_vendor}-%{_target_os}
 %endif
 
 # By default, build everything.
@@ -397,7 +397,7 @@ BuildRequires:  python3-base
 BuildRequires:  pkgconfig(libedit)
 BuildRequires:  pkgconfig(zlib)
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 # llvm does not work on s390
 ExcludeArch:    s390
 %if %{with ffi}
@@ -487,7 +487,7 @@ Summary:        CLANG frontend for LLVM
 Group:          Development/Languages/C and C++
 URL:            https://clang.llvm.org/
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Recommends:     clang-tools
 Recommends:     gcc
 Recommends:     glibc-devel
@@ -691,7 +691,7 @@ Summary:        Linker for Clang/LLVM
 Group:          Development/Tools/Building
 URL:            https://lld.llvm.org/
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 
 %description -n lld%{_sonum}
 LLD is a linker from the LLVM project. That is a drop-in replacement for system linkers and runs much faster than them. It also provides features that are useful for toolchain developers.
@@ -723,7 +723,7 @@ BuildRequires:  pkgconfig(panel)
 BuildRequires:  pkgconfig(python3)
 BuildRequires:  pkgconfig(zlib)
 Requires(post): update-alternatives
-Requires(postun):update-alternatives
+Requires(postun): update-alternatives
 Recommends:     python3-lldb%{_sonum}
 ExclusiveArch:  x86_64