Skip to content

Commit

Permalink
Add MHS as a recognized compiler. (#9878)
Browse files Browse the repository at this point in the history
* Add MHS as a recognized compiler.

* Add Changelog entry

* Add comment.

* Update checksums.

* Update more checksums.

---------

Co-authored-by: Lennart Augustsson <[email protected]>
  • Loading branch information
augustss and lennart-augustsson-epicgames authored Jun 15, 2024
1 parent 5ea22e2 commit 3169b87
Show file tree
Hide file tree
Showing 3 changed files with 14 additions and 5 deletions.
3 changes: 2 additions & 1 deletion Cabal-syntax/src/Distribution/Compiler.hs
Original file line number Diff line number Diff line change
Expand Up @@ -75,6 +75,7 @@ data CompilerFlavor
| LHC
| UHC
| Eta
| MHS -- MicroHS, see https://github.com/augustss/MicroHs
| HaskellSuite String -- string is the id of the actual compiler
| OtherCompiler String
deriving (Generic, Show, Read, Eq, Ord, Typeable, Data)
Expand All @@ -85,7 +86,7 @@ instance NFData CompilerFlavor where rnf = genericRnf

knownCompilerFlavors :: [CompilerFlavor]
knownCompilerFlavors =
[GHC, GHCJS, NHC, YHC, Hugs, HBC, Helium, JHC, LHC, UHC, Eta]
[GHC, GHCJS, NHC, YHC, Hugs, HBC, Helium, JHC, LHC, UHC, Eta, MHS]

instance Pretty CompilerFlavor where
pretty (OtherCompiler name) = Disp.text name
Expand Down
8 changes: 4 additions & 4 deletions Cabal-tests/tests/UnitTests/Distribution/Utils/Structured.hs
Original file line number Diff line number Diff line change
Expand Up @@ -33,15 +33,15 @@ md5Check proxy md5Int = structureHash proxy @?= md5FromInteger md5Int
md5CheckGenericPackageDescription :: Proxy GenericPackageDescription -> Assertion
md5CheckGenericPackageDescription proxy = md5Check proxy
#if MIN_VERSION_base(4,19,0)
0x4acd7857947385180d814f36dc1a759e
0x44f8430d7366cf849e09669627573040
#else
0x3ff3fa6c3c570bcafa10b457b1208cc8
0x8ed837568017bde3abb4fcee244b9c9f
#endif

md5CheckLocalBuildInfo :: Proxy LocalBuildInfo -> Assertion
md5CheckLocalBuildInfo proxy = md5Check proxy
#if MIN_VERSION_base(4,19,0)
0x552eca9ce2e4a34e74deff571f279fc4
0xdff58fe5e7f9568c67cd982eaba7edc2
#else
0x48497d6b3f15df06f1107b81b98febe1
0x4e50a4a95779b862edde3d6696797251
#endif
8 changes: 8 additions & 0 deletions changelog.d/pr-9878
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
synopsis: Add mhs as a known Haskell compiler
packages: Cabal
issues:
prs: #9878

description: {
This simply add MHS to the enumeration of known Haskell compilers.
}

0 comments on commit 3169b87

Please sign in to comment.