ghclibplatform: Cabal calls i686 as i386

ghc-rpm-macros.spec

@@ -7,7 +7,7 @@
 %endif
 
 Name:           ghc-rpm-macros
-Version:        2.3.6
+Version:        2.3.7
 Release:        1%{?dist}
 Summary:        RPM macros for building Haskell packages for GHC
 
@@ -184,6 +184,9 @@ EOF
 
 
 %changelog
+* Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.7-1
+- ghclibplatform: Cabal uses i386 for i686
+
 * Mon Dec 20 2021 Jens Petersen <petersen@redhat.com> - 2.3.6-1
 - fix missing Hadrian ghc dependency generation
 

macros.ghc

@@ -66,7 +66,8 @@ fi\
 
 %ghcliblib %{ghclibdir}%{?with_hadrian:/lib}
 
-%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/")-linux-ghc-%{ghc_version}}
+# Cabal has specific arch names
+%ghclibplatform %{ghcliblib}%{?with_hadrian:/%(arch | sed -e "s/ppc64le/ppc64/" -e "s/i686/i386/")-linux-ghc-%{ghc_version}}
 
 # ghc_gen_filelists [name] [version]
 %ghc_gen_filelists()\