Skip to content

Commit be41554

Browse files
committed
'stack setup' can install GHC on linux-aarch64
1 parent 02497e0 commit be41554

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

src/Stack/Config.hs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -296,6 +296,7 @@ configFromConfigMonoid
296296
configCompilerCheck = fromFirst MatchMinor configMonoidCompilerCheck
297297

298298
case arch of
299+
OtherArch "aarch64" -> return ()
299300
OtherArch unk -> logWarn $ "Warning: Unknown value for architecture setting: " <> T.pack (show unk)
300301
_ -> return ()
301302

src/Stack/Setup.hs

Lines changed: 12 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -930,17 +930,18 @@ getOSKey :: (MonadThrow m)
930930
=> Platform -> m Text
931931
getOSKey platform =
932932
case platform of
933-
Platform I386 Cabal.Linux -> return "linux32"
934-
Platform X86_64 Cabal.Linux -> return "linux64"
935-
Platform I386 Cabal.OSX -> return "macosx"
936-
Platform X86_64 Cabal.OSX -> return "macosx"
937-
Platform I386 Cabal.FreeBSD -> return "freebsd32"
938-
Platform X86_64 Cabal.FreeBSD -> return "freebsd64"
939-
Platform I386 Cabal.OpenBSD -> return "openbsd32"
940-
Platform X86_64 Cabal.OpenBSD -> return "openbsd64"
941-
Platform I386 Cabal.Windows -> return "windows32"
942-
Platform X86_64 Cabal.Windows -> return "windows64"
943-
Platform Arm Cabal.Linux -> return "linux-armv7"
933+
Platform I386 Cabal.Linux -> return "linux32"
934+
Platform X86_64 Cabal.Linux -> return "linux64"
935+
Platform I386 Cabal.OSX -> return "macosx"
936+
Platform X86_64 Cabal.OSX -> return "macosx"
937+
Platform I386 Cabal.FreeBSD -> return "freebsd32"
938+
Platform X86_64 Cabal.FreeBSD -> return "freebsd64"
939+
Platform I386 Cabal.OpenBSD -> return "openbsd32"
940+
Platform X86_64 Cabal.OpenBSD -> return "openbsd64"
941+
Platform I386 Cabal.Windows -> return "windows32"
942+
Platform X86_64 Cabal.Windows -> return "windows64"
943+
Platform Arm Cabal.Linux -> return "linux-armv7"
944+
Platform (OtherArch "aarch64") Cabal.Linux -> return "linux-aarch64"
944945
Platform arch os -> throwM $ UnsupportedSetupCombo os arch
945946

946947
downloadFromInfo

0 commit comments

Comments
 (0)