From c2660c6ba0ef23b0e3e16bdccaa39871a09f4560 Mon Sep 17 00:00:00 2001 From: David Abdurachmanov Date: Mon, 20 Nov 2023 19:33:49 +0200 Subject: [PATCH] Changes for riscv64 These remove a ton of verbose warnings on riscv64 unregistered build. RISCV might be unstable with -j higher than 1. This needs retesting. Last time tested with GHC 9.2 + LLVM 12 and 13, not with the current GHC 9.4 + LLVM 14. Signed-off-by: David Abdurachmanov --- macros.ghc | 2 +- macros.ghc-os | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/macros.ghc b/macros.ghc index 71e2434..144751a 100644 --- a/macros.ghc +++ b/macros.ghc @@ -79,7 +79,7 @@ fi\ %global _lto_cflags %{nil}\ %global __brp_strip_lto %{nil}\ CFLAGS="${CFLAGS:-%optflags}"\ -%ifarch s390x\ +%ifarch s390x riscv64\ %if %[v"%{ghc_version}" < v"9.2"]\ # -Wunused-label is extremely noisy\ CFLAGS="$(echo ${CFLAGS:-%optflags} | sed -e 's/-Wall //' -e 's/-Werror=format-security //')"\ diff --git a/macros.ghc-os b/macros.ghc-os index 69ddac8..1e4fe4f 100644 --- a/macros.ghc-os +++ b/macros.ghc-os @@ -8,4 +8,4 @@ %with_haddock 1 # %%{?_smp_ncpus_max:--jobs=%%{?_smp_ncpus_max}} -%ghc_smp_mflags %{?_smp_mflags} +%ghc_smp_mflags -j1