Skip to content

Improve CABALDIR handling #34

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
AlexandreTunstall wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Improve CABALDIR handling #34

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
dc358bb
Honour CABALDIR when installing microhs libraries
AlexandreTunstall Sep 9, 2025
3898e5f
Set the mhs package search path explicitly
AlexandreTunstall Sep 9, 2025
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
9 changes: 6 additions & 3 deletions src/MicroCabal/Backend/MHS.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -129,9 +129,10 @@ mhsBuildExe env (Section _ _ gflds) (Section _ name flds) = do
mkdir env $ distDir env </> binMhs
mainIs' <- findMainIs env srcDirs mainIs
stdArgs <- setupStdArgs env flds
mhsDir <- getMhsDir env
let args = unwords $ stdArgs ++
csrc ++
["-z", "-a.","-o" ++ bin, mainIs']
["-z", "-a"++mhsDir,"-o" ++ bin, mainIs']
message env 0 $ "Build " ++ bin ++ " with mhs"
mhs env args

Expand Down Expand Up @@ -169,6 +170,7 @@ mhsBuildLib :: Env -> Section -> Section -> IO ()
mhsBuildLib env (Section _ _ glob) (Section _ name flds) = do
initDB env
stdArgs <- setupStdArgs env flds
mhsDir <- getMhsDir env
let mdls = getFieldStrings flds [] "exposed-modules"
omdls = getFieldStrings flds [] "other-modules"
vers = getVersion glob "version"
Expand All @@ -181,7 +183,7 @@ mhsBuildLib env (Section _ _ glob) (Section _ name flds) = do
["-P" ++ namever,
"-o" ++ pkgfn] ++
stdArgs ++
["-a."] ++
["-a" ++ mhsDir] ++
mdls
isMdl (' ':_) = True -- Relies on -L output format
isMdl _ = False
Expand All @@ -206,7 +208,8 @@ mhsInstallLib env (Section _ _ glob) (Section _ name _) = do
initDB env
let vers = getVersion glob "version"
namever = distDir env ++ "/" ++ name ++ "-" ++ showVersion vers
mhs env $ "-Q " ++ namever ++ ".pkg"
mhsDir <- getMhsDir env
mhs env $ "-Q " ++ namever ++ ".pkg " ++ mhsDir

---
-- XXX
Expand Down
Loading