Skip to content

Commit

Permalink
Account for .buildinfo in repl when build-type: Configure (haskell#9440)
Browse files Browse the repository at this point in the history
In `autoconfUserHooks` we were not updating the `preRepl` hook to read
additional build information from /package/@.buildinfo@.

Additionally updates `autoconfUserHooks` to read additional build info
information for the remaining pre-hooks that are not pre-conf.

Fixes haskell#9401
  • Loading branch information
alt-romes authored Jan 12, 2024
1 parent 4242e15 commit ee1e6b8
Show file tree
Hide file tree
Showing 2 changed files with 16 additions and 3 deletions.
8 changes: 5 additions & 3 deletions Cabal/src/Distribution/Simple.hs
Original file line number Diff line number Diff line change
Expand Up @@ -743,8 +743,7 @@ simpleUserHooks =
--
-- * 'postConf' runs @.\/configure@, if present.
--
-- * the pre-hooks 'preBuild', 'preClean', 'preCopy', 'preInst',
-- 'preReg' and 'preUnreg' read additional build information from
-- * the pre-hooks, except for pre-conf, read additional build information from
-- /package/@.buildinfo@, if present.
--
-- Thus @configure@ can use local system information to generate
Expand All @@ -753,14 +752,17 @@ autoconfUserHooks :: UserHooks
autoconfUserHooks =
simpleUserHooks
{ postConf = defaultPostConf
, preBuild = readHookWithArgs buildVerbosity buildDistPref -- buildCabalFilePath,
, preBuild = readHookWithArgs buildVerbosity buildDistPref
, preRepl = readHookWithArgs replVerbosity replDistPref
, preCopy = readHookWithArgs copyVerbosity copyDistPref
, preClean = readHook cleanVerbosity cleanDistPref
, preInst = readHook installVerbosity installDistPref
, preHscolour = readHook hscolourVerbosity hscolourDistPref
, preHaddock = readHookWithArgs haddockVerbosity haddockDistPref
, preReg = readHook regVerbosity regDistPref
, preUnreg = readHook regVerbosity regDistPref
, preTest = readHookWithArgs testVerbosity testDistPref
, preBench = readHookWithArgs benchmarkVerbosity benchmarkDistPref
}
where
defaultPostConf
Expand Down
11 changes: 11 additions & 0 deletions changelog.d/issue-9401
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
synopsis: Account for .buildinfo in repl, test, and bench
packages: Cabal
prs: #9440
issues: #9401

description: {

Generated <project>.buildinfo is now respected in cabal repl, cabal test and cabal bench.

}

0 comments on commit ee1e6b8

Please sign in to comment.