From d8882cfdd1320f04e47a0758f21b0b58c2e19eb1 Mon Sep 17 00:00:00 2001 From: Christoph Erhardt Date: Sat, 16 Apr 2022 17:03:26 +0200 Subject: [PATCH] Drop conditional statements for el7 We don't build mold for el7 because mimalloc isn't available there. Should somebody request packaging mold for an eight-year-old distribution, we can re-add that code. --- mold.spec | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/mold.spec b/mold.spec index 2d306a2..fe30395 100644 --- a/mold.spec +++ b/mold.spec @@ -28,13 +28,9 @@ Patch3: 0003-Increase-required-glibc-version-for-static-pie-tests.patch ExclusiveArch: x86_64 aarch64 riscv64 BuildRequires: cmake -%if 0%{?el7} -BuildRequires: devtoolset-10-toolchain -%endif %if 0%{?el8} BuildRequires: gcc-toolset-10-toolchain -%endif -%if 0%{!?el7} && 0%{!?el8} +%else BuildRequires: gcc BuildRequires: gcc-c++ >= 10 %endif @@ -76,9 +72,6 @@ build time, especially in rapid debug-edit-rebuild cycles. rm -r third-party/{mimalloc,xxhash} %build -%if 0%{?el7} -. /opt/rh/devtoolset-10/enable -%endif %if 0%{?el8} . /opt/rh/gcc-toolset-10/enable %endif @@ -101,9 +94,6 @@ if [ "$1" = 0 ]; then fi %check -%if 0%{?el7} -. /opt/rh/devtoolset-10/enable -%endif %if 0%{?el8} . /opt/rh/gcc-toolset-10/enable %endif