From: Debian Haskell Group <pkg-haskell-maintainers@lists.alioth.debian.org>
Date: Sat, 24 Jan 2026 12:41:42 +0000 (+0200)
Subject: hadrian-unreg-template-haskell
X-Git-Tag: archive/raspbian/9.10.3-3+rpi1^2~5
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=a7cbe5b8ec068fb3686f3296b164bcdedb3d55bb;p=ghc.git

hadrian-unreg-template-haskell

commit 702f7964373d9ffb1d550ee714bd723d8bb0c1a3
Author: Matthew Pickering <matthewtpickering@gmail.com>
Date:   Mon Apr 29 12:13:00 2024 +0100

    Make interface files and object files depend on inplace .conf file

    A potential fix for #24737


Gbp-Pq: Name hadrian-unreg-template-haskell
---

diff --git a/hadrian/src/Rules/Compile.hs b/hadrian/src/Rules/Compile.hs
index 473d2cf7..d8ca9ab4 100644
--- a/hadrian/src/Rules/Compile.hs
+++ b/hadrian/src/Rules/Compile.hs
@@ -218,6 +218,9 @@ compileHsObjectAndHi rs objpath = do
   ctxPath <- contextPath ctx
   (src, deps) <- lookupDependencies (ctxPath -/- ".dependencies") objpath
   need (src:deps)
+  -- The .conf file is needed when template-haskell is implicitly added as a dependency
+  -- when a module in the template-haskell package is compiled. (See #24737)
+  when  (isLibrary (C.package ctx)) (need . (:[]) =<< pkgConfFile ctx)
 
   -- The .dependencies file lists indicating inputs. ghc will
   -- generally read more *.hi and *.hi-boot files (direct inputs).