Merge pull request haskell#9434 from sthibaul/master

Fix the platform string for GNU/Hurd
mpickering · Nov 16, 2023 · a134b26 · a134b26
2 parents d063048 + 1a89c9d
commit a134b26
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/Cabal/src/Distribution/Simple/GHC/Internal.hs b/Cabal/src/Distribution/Simple/GHC/Internal.hs
@@ -785,6 +785,7 @@ ghcOsString :: OS -> String
 ghcOsString Windows = "mingw32"
 ghcOsString OSX = "darwin"
 ghcOsString Solaris = "solaris2"
+ghcOsString Hurd = "gnu"
 ghcOsString other = prettyShow other
 
 -- | GHC's rendering of its platform and compiler version string as used in

diff --git a/changelog.d/pr-9434 b/changelog.d/pr-9434
@@ -0,0 +1,11 @@
+synopsis: Fix the platform string for GNU/Hurd
+packages: Cabal
+prs: #9434
+
+description: {
+
+Depending who you ask, GNU/Hurd will be labelled "gnu" or "hurd". The autotools
+use "gnu", so ghc follows this for installed files, even if the ghc source code
+uses OSHurd. We thus need to add the translation between the two.
+
+}