From d3d63e1f8cf3980d6d4cf0ad4b2df3004e54542d Mon Sep 17 00:00:00 2001 From: "Benjamin A. Beasley" Date: Tue, 17 Oct 2023 11:59:48 -0400 Subject: [PATCH] Reorganize sanitizer conditionals --- wlcs.spec | 31 ++++++++++++------------------- 1 file changed, 12 insertions(+), 19 deletions(-) diff --git a/wlcs.spec b/wlcs.spec index 917abe3..4d77592 100644 --- a/wlcs.spec +++ b/wlcs.spec @@ -1,29 +1,22 @@ -# List copied from gcc.spec -# Current as of 13.1.1 (line 66) -# Note that this covers all Fedora primary architectures. +# Lists copied from gcc.spec +# Current as of 13.2.1 (lines 66, 86, and 76, respectively). +# Note that asan and ubsan are available on all Fedora primary architectures; +# tsan is missing on i686 only. %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 -%bcond asan 1 -%else -%bcond asan 0 +%global arch_has_asan 1 %endif - -# List copied from gcc.spec -# Current as of 13.1.1 (line 86) -# Note that this covers all Fedora primary architectures. %ifarch %{ix86} x86_64 ppc ppc64 ppc64le ppc64p7 s390 s390x %{arm} aarch64 -%bcond ubsan 1 -%else -%bcond ubsan 0 +%global arch_has_ubsan 1 %endif - -# List copied from gcc.spec -# Current as of 13.1.1 (line 76) %ifarch x86_64 ppc64 ppc64le aarch64 s390x -%bcond tsan 1 -%else -%bcond tsan 0 +%global arch_has_tsan 1 %endif +# By default, enable sanitizers whenever they are available on the architecture. +%bcond asan 0%{?arch_has_asan:1} +%bcond ubsan 0%{?arch_has_ubsan:1} +%bcond tsan 0%{?arch_has_tsan:1} + Name: wlcs Version: 1.6.0 Release: %autorelease