[Git][haskell-team/haskell-devscripts][master] Modify ghc_pkg_command() to work with the new Hadrian build system

[Ilias Tsitsimpis (@iliastsi)]

Ilias Tsitsimpis pushed to branch master at Debian Haskell Group / haskell-devscripts


Commits:
e5815f8c by Ilias Tsitsimpis at 2023-09-20T10:28:26+03:00
Modify ghc_pkg_command() to work with the new Hadrian build system

- - - - -


2 changed files:

- debian/changelog
- lib/Debian/Debhelper/Buildsystem/Haskell/Recipes.pm


Changes:

=====================================
debian/changelog
=====================================
@@ -1,3 +1,9 @@
+haskell-devscripts (0.16.31) unstable; urgency=medium
+
+  * Modify ghc_pkg_command() to work with the new Hadrian build system
+
+ -- Ilias Tsitsimpis <iliastsi at debian.org>  Tue, 19 Sep 2023 22:02:36 +0300
+
 haskell-devscripts (0.16.30) unstable; urgency=medium
 
   * Add compatibility for GHC 9.4


=====================================
lib/Debian/Debhelper/Buildsystem/Haskell/Recipes.pm
=====================================
@@ -346,11 +346,17 @@ sub ghc_pkg_command {
     my () = @_;
 
     my $inplace_ghc_pkg = 'inplace/bin/ghc-pkg';
+    my $stage2_ghc_pkg = '_build/stage1/bin/ghc-pkg';
 
     # building ghc; use the new ghc-pkg
+    # (this is the old location when using the make build system)
     return $inplace_ghc_pkg
       if -x $inplace_ghc_pkg;
 
+    # (this is the new location when using the Hadrian build system)
+    return $stage2_ghc_pkg
+      if -x $stage2_ghc_pkg;
+
     return 'ghc-pkg';
 }
 



View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/commit/e5815f8c287283c5aacc8712aeb379719b45d9c6

-- 
View it on GitLab: https://salsa.debian.org/haskell-team/haskell-devscripts/-/commit/e5815f8c287283c5aacc8712aeb379719b45d9c6
You're receiving this email because of your account on salsa.debian.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-haskell-commits/attachments/20230920/7e068d58/attachment-0001.htm>