Fix libtsan/liblsan replace rules to include .a files
The gcc spec now has libtsan.a and liblsan.a lines between the .so and _preinit.o entries. Update find/replace patterns in both the install loop and sysroot %files sections to match.
This commit is contained in:
parent
cece880f76
commit
68be38be1e
@ -45,16 +45,20 @@ actions:
|
||||
- target: "spec"
|
||||
find: |
|
||||
%{_prefix}/lib64/libtsan.so.2 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.a \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o \
|
||||
%{_prefix}/lib64/liblsan.so.0 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan.a \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o \
|
||||
replace: |
|
||||
%if %{build_libtsan}
|
||||
%{_prefix}/lib64/libtsan.so.2 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.a \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o \
|
||||
%endif
|
||||
%if %{build_liblsan}
|
||||
%{_prefix}/lib64/liblsan.so.0 \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan.a \
|
||||
%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o \
|
||||
%endif
|
||||
count: 1
|
||||
@ -89,16 +93,20 @@ actions:
|
||||
- target: "spec"
|
||||
find: |
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libtsan.so.2
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.a
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o
|
||||
%{sysroot_prefix}%{_prefix}/lib64/liblsan.so.0
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan.a
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o
|
||||
replace: |
|
||||
%if %{build_libtsan}
|
||||
%{sysroot_prefix}%{_prefix}/lib64/libtsan.so.2
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan.a
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/libtsan_preinit.o
|
||||
%endif
|
||||
%if %{build_liblsan}
|
||||
%{sysroot_prefix}%{_prefix}/lib64/liblsan.so.0
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan.a
|
||||
%{sysroot_prefix}%{_prefix}/lib/gcc/%{gcc_target_platform}/%{gcc_major}/liblsan_preinit.o
|
||||
%endif
|
||||
count: 1
|
||||
|
||||
Loading…
Reference in New Issue
Block a user