From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Tue, 5 Nov 2024 23:21:23 +0000 (+0100)
Subject: hurd-hadrian-supportrpaths
X-Git-Tag: archive/raspbian/9.6.6-4+rpi1^2^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=da58bebc3b4a4d2d70183216d6a1cc4d8f1c42f0;p=ghc.git

hurd-hadrian-supportrpaths

Can be dropped with 9.8.1
Debian-Bug: https://bugs.debian.org/1056305


Gbp-Pq: Name hurd-hadrian-supportrpaths
---

diff --git a/hadrian/src/Oracles/Setting.hs b/hadrian/src/Oracles/Setting.hs
index f35033a6..d516d1d2 100644
--- a/hadrian/src/Oracles/Setting.hs
+++ b/hadrian/src/Oracles/Setting.hs
@@ -278,7 +278,7 @@ anyHostOs = matchSetting HostOs
 isElfTarget :: Action Bool
 isElfTarget = anyTargetOs
     [ "linux", "freebsd", "dragonfly", "openbsd", "netbsd", "solaris2", "kfreebsdgnu"
-    , "haiku", "linux-android"
+    , "gnu", "haiku", "linux-android"
     ]
 
 -- | Check whether the host OS supports the @-rpath@ linker option when
@@ -287,7 +287,7 @@ isElfTarget = anyTargetOs
 -- TODO: Windows supports lazy binding (but GHC doesn't currently support
 --       dynamic way on Windows anyways).
 hostSupportsRPaths :: Action Bool
-hostSupportsRPaths = anyHostOs ["linux", "darwin", "freebsd"]
+hostSupportsRPaths = anyHostOs ["linux", "darwin", "freebsd", "gnu"]
 
 -- | Check whether the target supports GHCi.
 ghcWithInterpreter :: Action Bool