SHA256
1
0
forked from pool/llvm17

Accepting request 1138113 from home:favogt:branches:devel:tools:compiler

- Use %_target_* for determining the compiler host triple (boo#1218701)

OBS-URL: https://build.opensuse.org/request/show/1138113
OBS-URL: https://build.opensuse.org/package/show/devel:tools:compiler/llvm17?expand=0&rev=19
This commit is contained in:
Aaron Puchert 2024-01-11 23:36:55 +00:00 committed by Git OBS Bridge
parent 56861a2a4e
commit 225f8d30f2
2 changed files with 12 additions and 7 deletions

View File

@ -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> Thu Nov 30 22:53:03 UTC 2023 - Aaron Puchert <aaronpuchert@alice-dsl.net>

View File

@ -1,7 +1,7 @@
# #
# spec file for package llvm17 # spec file for package llvm17
# #
# Copyright (c) 2023 SUSE LLC # Copyright (c) 2024 SUSE LLC
# #
# All modifications and additions to the file contributed by third parties # All modifications and additions to the file contributed by third parties
# remain the property of their copyright owners, unless otherwise agreed # remain the property of their copyright owners, unless otherwise agreed
@ -69,15 +69,15 @@
# Figure out the host triple. # Figure out the host triple.
%ifarch armv6hl %ifarch armv6hl
# See https://build.opensuse.org/request/show/968066. # See https://build.opensuse.org/request/show/968066.
%define host_cpu armv6kz %define target_cpu armv6kz
%else %else
%define host_cpu %{_host_cpu} %define target_cpu %{_target_cpu}
%endif %endif
%ifarch %{arm} %ifarch %{arm}
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os}-gnueabihf %define host_triple %{target_cpu}-%{_target_vendor}-%{_target_os}-gnueabihf
%else %else
%define host_triple %{host_cpu}-%{_host_vendor}-%{_host_os} %define host_triple %{target_cpu}-%{_target_vendor}-%{_target_os}
%endif %endif
# By default, build everything. # By default, build everything.
@ -1675,8 +1675,8 @@ fi
%{_libdir}/libomptarget-nvptx-*.bc %{_libdir}/libomptarget-nvptx-*.bc
%ifarch aarch64 ppc64le x86_64 %ifarch aarch64 ppc64le x86_64
%{_libdir}/libomptarget.devicertl.a %{_libdir}/libomptarget.devicertl.a
%{_libdir}/libomptarget.rtl.{%{host_cpu},amdgpu,cuda}.so %{_libdir}/libomptarget.rtl.{%{target_cpu},amdgpu,cuda}.so
%{_libdir}/libomptarget.rtl.{%{host_cpu},amdgpu,cuda}.so.%{_soname} %{_libdir}/libomptarget.rtl.{%{target_cpu},amdgpu,cuda}.so.%{_soname}
%endif %endif
%endif %endif
%{_libdir}/cmake/openmp %{_libdir}/cmake/openmp