Merge pull request #8243 from haskell/mergify/bp/3.8/pr-8232

Apple Silicon Foreign Library Support (#8227) (backport #8232)
haskell · Jun 22, 2022 · 297098a · 297098a
2 parents 534a6c5 + 3bd101f
commit 297098a
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 2 deletions.
diff --git a/Cabal/src/Distribution/Simple/Configure.hs b/Cabal/src/Distribution/Simple/Configure.hs
@@ -2065,12 +2065,12 @@ checkForeignLibSupported comp platform flib = go (compilerFlavor comp)
       ]
 
     goGhcPlatform :: Platform -> Maybe String
-    goGhcPlatform (Platform X86_64 OSX    ) = goGhcOsx     (foreignLibType flib)
+    goGhcPlatform (Platform _      OSX    ) = goGhcOsx     (foreignLibType flib)
     goGhcPlatform (Platform _      Linux  ) = goGhcLinux   (foreignLibType flib)
     goGhcPlatform (Platform I386   Windows) = goGhcWindows (foreignLibType flib)
     goGhcPlatform (Platform X86_64 Windows) = goGhcWindows (foreignLibType flib)
     goGhcPlatform _ = unsupported [
-        "Building foreign libraries is currently only supported on OSX, "
+        "Building foreign libraries is currently only supported on Mac OS, "
       , "Linux and Windows"
       ]
 

diff --git a/changelog.d/issue-8227 b/changelog.d/issue-8227
@@ -0,0 +1,12 @@
+synopsis: Enabled foreign library building on apple silicon
+packages: Cabal
+prs: #8232
+issues: #8227 #7837
+significance: significant
+
+description: {
+
+- Enabled foreign library building on apple silicon
+- Updated error message for foreign library builds on unsupported platforms
+
+}