From 86424569190c2c0f36382b003b98f8a7a9216576 Mon Sep 17 00:00:00 2001
From: James Hobson <j.w.hobson@icloud.com>
Date: Sun, 19 Jun 2022 00:12:38 +0200
Subject: [PATCH] Apple Silicon Foreign Library Support (#8227)
- Allowed building Foreign Libraries for all architecture on apple
silicon
- Updated error message to name Mac OS instead of OSX as supported
platform
(cherry picked from commit 99f928e2dfe6160b5e5e2c8a516acc8786e879bb)
---
Cabal/src/Distribution/Simple/Configure.hs | 4 ++--
changelog.d/issue-8227 | 11 +++++++++++
2 files changed, 13 insertions(+), 2 deletions(-)
create mode 100644 changelog.d/issue-8227
diff --git a/Cabal/src/Distribution/Simple/Configure.hs b/Cabal/src/Distribution/Simple/Configure.hs
index 1ae686b2ec..4d40d30bff 100644
--- 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
new file mode 100644
index 0000000000..1a43d89813
--- /dev/null
+++ b/changelog.d/issue-8227
@@ -0,0 +1,11 @@
+synopsis: Enabled foreign library building on apple silicon
+packages: cabal-install
+issues: #8227, #7837
+significance: significant
+
+description: {
+
+- Enabled foreign library building on apple silicon
+- Updated error message for foreign library builds on unsupported platforms
+
+}
--
GitLab