Skip to content

Commit 172a0aa

Browse files
committed
Install i386 config files for x86_64
1 parent 7553970 commit 172a0aa

File tree

1 file changed

+13
-1
lines changed

1 file changed

+13
-1
lines changed

llvm.spec

Lines changed: 13 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@
182182
#region main package
183183
Name: %{pkg_name_llvm}
184184
Version: %{maj_ver}.%{min_ver}.%{patch_ver}%{?rc_ver:~rc%{rc_ver}}%{?llvm_snapshot_version_suffix:~%{llvm_snapshot_version_suffix}}
185-
Release: 1%{?dist}
185+
Release: 2%{?dist}
186186
Summary: The Low Level Virtual Machine
187187

188188
License: Apache-2.0 WITH LLVM-exception OR NCSA
@@ -1296,6 +1296,11 @@ echo "%%clang%{maj_ver}_resource_dir %%{_prefix}/lib/clang/%{maj_ver}" >> %{buil
12961296
mkdir -p %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/
12971297
echo " %{cfg_file_content}" >> %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/%{_target_platform}-clang.cfg
12981298
echo " %{cfg_file_content}" >> %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/%{_target_platform}-clang++.cfg
1299+
%ifarch x86_64
1300+
# On x86_64, install an additional set of config files so -m32 works.
1301+
echo " %{cfg_file_content}" >> %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/i386-redhat-linux-gnu-clang.cfg
1302+
echo " %{cfg_file_content}" >> %{buildroot}%{_sysconfdir}/%{pkg_name_clang}/i386-redhat-linux-gnu-clang++.cfg
1303+
%endif
12991304
%endif
13001305

13011306

@@ -2131,6 +2136,10 @@ fi
21312136
%{install_bindir}/clang-cpp
21322137
%{_sysconfdir}/%{pkg_name_clang}/%{_target_platform}-clang.cfg
21332138
%{_sysconfdir}/%{pkg_name_clang}/%{_target_platform}-clang++.cfg
2139+
%ifarch x86_64
2140+
%{_sysconfdir}/%{pkg_name_clang}/i386-redhat-linux-gnu-clang.cfg
2141+
%{_sysconfdir}/%{pkg_name_clang}/i386-redhat-linux-gnu-clang++.cfg
2142+
%endif
21342143
%{_mandir}/man1/clang-%{maj_ver}.1.gz
21352144
%{_mandir}/man1/clang++-%{maj_ver}.1.gz
21362145
%if %{without compat_build}
@@ -2462,6 +2471,9 @@ fi
24622471

24632472
#region changelog
24642473
%changelog
2474+
* Mon Nov 18 2024 Timm Bäder <[email protected]> - 19.1.3-2
2475+
- Install i386 config files on x86_64
2476+
24652477
* Tue Nov 05 2024 Timm Bäder <[email protected]> - 19.1.3-1
24662478
- Update to 19.1.3
24672479

0 commit comments

Comments
 (0)