Skip to content

Account for .buildinfo in repl when build-type: Configure (backport #9440) #9612

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jan 12, 2024
Merged

Account for .buildinfo in repl when build-type: Configure (backport #9440) #9612

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
44e2b28
Account for .buildinfo in repl when build-type: Configure (#9440)
alt-romes Jan 12, 2024
8b34935
Update Simple.hs
Kleidukos Jan 12, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions Cabal/src/Distribution/Simple.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -576,8 +576,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 @@ -588,14 +587,17 @@ 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
preUnreg = readHook regVerbosity regDistPref,
preTest = readHookWithArgs testVerbosity testDistPref,
preBench = readHookWithArgs benchmarkVerbosity benchmarkDistPref
}
where defaultPostConf :: Args -> ConfigFlags -> PackageDescription
-> LocalBuildInfo -> IO ()
Expand Down
11 changes: 11 additions & 0 deletions changelog.d/issue-9401
View file
Open in desktop
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.

}