Skip to content

Make Setup.hs compatible with Cabal >= 3.18 #97

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

Open
sternenseemann wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Make Setup.hs compatible with Cabal >= 3.18 #97

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
21 changes: 16 additions & 5 deletions Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,15 @@ main = defaultMainWithHooks hk

compileCheck :: FilePath -> String -> String -> String -> IO Bool
compileCheck cc testName message sourceCode = do
withTempDirectory normal "" testName $ \tmpDir -> do
writeFile (tmpDir ++ "/" ++ testName ++ ".c") sourceCode
ec <- myRawSystemExitCode normal cc [tmpDir </> testName ++ ".c", "-o", tmpDir ++ "/a","-no-hs-main"]
notice normal $ message ++ show (ec == ExitSuccess)
return (ec == ExitSuccess)
withTempDirectory
#if !MIN_VERSION_Cabal(3,18,0)
myNormal
#endif
"" testName $ \tmpDir -> do
writeFile (tmpDir ++ "/" ++ testName ++ ".c") sourceCode
ec <- myRawSystemExitCode myNormal cc [tmpDir </> testName ++ ".c", "-o", tmpDir ++ "/a","-no-hs-main"]
notice myNormal $ message ++ show (ec == ExitSuccess)
return (ec == ExitSuccess)

addOptions :: [String] -> [String] -> LocalBuildInfo -> LocalBuildInfo
addOptions cArgs hsArgs lbi = lbi {withPrograms = newWithPrograms }
Expand Down Expand Up @@ -131,3 +135,10 @@ myRawSystemExitCode verbosity path args = do
| verbosity >= verbose = putStrLn $ unwords (path : args)
| otherwise = return ()
#endif

myNormal :: Verbosity
#if MIN_VERSION_Cabal(3,18,0)
myNormal = mkVerbosity defaultVerbosityHandles normal
#else
myNormal = normal
#endif