Commit e1d9192f authored by Duncan Coutts's avatar Duncan Coutts
Browse files

Couple of trivial code changes

parent 1c20a632
......@@ -394,7 +394,6 @@ hookedAction pre_hook cmd_hook post_hook get_build_config hooks flags args = do
-- localbuildinfo?
cmd_hook hooks pkg_descr localbuildinfo hooks flags
post_hook hooks args flags pkg_descr localbuildinfo
where
sanityCheckHookedBuildInfo :: PackageDescription -> HookedBuildInfo -> IO ()
sanityCheckHookedBuildInfo PackageDescription { library = Nothing } (Just _,_)
......
......@@ -191,15 +191,13 @@ preprocessComponent pd comp lbi isSrcDist verbosity handlers = case comp of
(CExe exe@Executable { buildInfo = bi, exeName = nm }) -> do
let exeDir = buildDir lbi </> nm </> nm ++ "-tmp"
dirs = hsSourceDirs bi ++ [autogenModulesDir lbi]
unless (null (executables pd)) $
setupMessage verbosity ("Preprocessing executable '" ++ nm ++ "' for") (packageId pd)
setupMessage verbosity ("Preprocessing executable '" ++ nm ++ "' for") (packageId pd)
forM_ (map ModuleName.toFilePath $ otherModules bi) $
pre dirs exeDir (localHandlers bi)
pre (hsSourceDirs bi) exeDir (localHandlers bi) $
dropExtensions (modulePath exe)
CTest test -> do
unless (null (testSuites pd)) $
setupMessage verbosity "Preprocessing test suites for" (packageId pd)
CTest test@TestSuite{ testName = nm } -> do
setupMessage verbosity ("Preprocessing test suite '" ++ nm ++ "' for") (packageId pd)
case testInterface test of
TestSuiteExeV10 _ f ->
preProcessTest test f $ buildDir lbi </> testName test
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment