From fc7876f93c39aa1cd34725f9eaf039ac48cefb0b Mon Sep 17 00:00:00 2001 From: Ilias Tsitsimpis Date: Mon, 16 Sep 2024 00:17:25 +0300 Subject: [PATCH] Enable GHCi on all platforms in Debian Bug: https://gitlab.haskell.org/ghc/ghc/-/issues/24098 Gbp-Pq: Name hadrian-enable-interpreter --- hadrian/bindist/config.mk.in | 4 ++-- hadrian/src/Oracles/Setting.hs | 9 ++------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/hadrian/bindist/config.mk.in b/hadrian/bindist/config.mk.in index cb85c67a..7676c0f4 100644 --- a/hadrian/bindist/config.mk.in +++ b/hadrian/bindist/config.mk.in @@ -140,8 +140,8 @@ GhcWithSMP := $(strip $(if $(filter YESNO, $(ArchSupportsSMP)$(GhcUnregisterised # Whether to include GHCi in the compiler. Depends on whether the RTS linker # has support for this OS/ARCH combination. -OsSupportsGHCi=$(strip $(patsubst $(TargetOS_CPP), YES, $(findstring $(TargetOS_CPP), mingw32 linux solaris2 freebsd dragonfly netbsd openbsd darwin kfreebsdgnu))) -ArchSupportsGHCi=$(strip $(patsubst $(TargetArch_CPP), YES, $(findstring $(TargetArch_CPP), i386 x86_64 powerpc powerpc64 powerpc64le sparc sparc64 arm aarch64))) +OsSupportsGHCi=YES +ArchSupportsGHCi=YES ifeq "$(OsSupportsGHCi)$(ArchSupportsGHCi)" "YESYES" GhcWithInterpreter=YES diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs index 96356f83..f35033a6 100644 --- a/hadrian/src/Oracles/Setting.hs +++ b/hadrian/src/Oracles/Setting.hs @@ -292,13 +292,8 @@ hostSupportsRPaths = anyHostOs ["linux", "darwin", "freebsd"] -- | Check whether the target supports GHCi. ghcWithInterpreter :: Action Bool ghcWithInterpreter = do - goodOs <- anyTargetOs [ "mingw32", "cygwin32", "linux", "solaris2" - , "freebsd", "dragonfly", "netbsd", "openbsd" - , "darwin", "kfreebsdgnu" ] - goodArch <- anyTargetArch [ "i386", "x86_64", "powerpc" - , "arm", "aarch64", "s390x" - , "powerpc64", "powerpc64le" ] - return $ goodOs && goodArch + -- Enable GHCi on all platforms for Debian + return True -- | Variants of the ARM architecture. data ArmVersion = ARMv5 | ARMv6 | ARMv7 -- 2.30.2