From 1dff9d523969df6da4ca5017e015fdbfd55a8d0e Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Mon, 13 Nov 2023 19:44:46 +0100 Subject: [PATCH] hurd: Enable using $ORIGIN in RPATH GNU/Hurd fully supports RPATH and the $ORIGIN development, and we indeed want to use it for relocatable installations shipped in Debian GNU/Hurd. --- Cabal/src/Distribution/Simple/GHC.hs | 2 +- Cabal/src/Distribution/Simple/GHCJS.hs | 2 +- changelog.d/pr-9441 | 3 +++ 3 files changed, 5 insertions(+), 2 deletions(-) create mode 100644 changelog.d/pr-9441 diff --git a/Cabal/src/Distribution/Simple/GHC.hs b/Cabal/src/Distribution/Simple/GHC.hs index f218d7c117a..3d79a8356ab 100644 --- a/Cabal/src/Distribution/Simple/GHC.hs +++ b/Cabal/src/Distribution/Simple/GHC.hs @@ -2022,7 +2022,7 @@ getRPaths lbi clbi | supportRPaths hostOS = do supportRPaths Android = False supportRPaths Ghcjs = False supportRPaths Wasi = False - supportRPaths Hurd = False + supportRPaths Hurd = True supportRPaths Haiku = False supportRPaths (OtherOS _) = False -- Do _not_ add a default case so that we get a warning here when a new OS diff --git a/Cabal/src/Distribution/Simple/GHCJS.hs b/Cabal/src/Distribution/Simple/GHCJS.hs index 5ed2d9327e9..c13afba220c 100644 --- a/Cabal/src/Distribution/Simple/GHCJS.hs +++ b/Cabal/src/Distribution/Simple/GHCJS.hs @@ -1697,7 +1697,7 @@ getRPaths lbi clbi | supportRPaths hostOS = do supportRPaths Android = False supportRPaths Ghcjs = False supportRPaths Wasi = False - supportRPaths Hurd = False + supportRPaths Hurd = True supportRPaths Haiku = False supportRPaths (OtherOS _) = False -- Do _not_ add a default case so that we get a warning here when a new OS diff --git a/changelog.d/pr-9441 b/changelog.d/pr-9441 new file mode 100644 index 00000000000..c47ea10da13 --- /dev/null +++ b/changelog.d/pr-9441 @@ -0,0 +1,3 @@ +synopsis: Enable using $ORIGIN in RPATH on GNU/Hurd +packages: Cabal +prs: #9441