Commit a161b8ee authored by Alp Mestanogullari's avatar Alp Mestanogullari Committed by Andrey Mokhov

Fix unlit by placing it under lib/bin/ instead of bin/ (#591)

A nicer fix would involve patching GHC to not just look under
$libexec/ but also under the directory where the GHC binary itself lives
(bin/ for hadrian), so that we can leave all binaries under bin/.

Addresses Trac #15132.
parent d8190ba0
......@@ -131,8 +131,10 @@ programPath context@Context {..} = do
-- The @touchy@ utility lives in the @lib/bin@ directory instead of @bin@,
-- which is likely just a historical accident that will hopefully be fixed.
-- See: https://github.com/snowleopard/hadrian/issues/570
path <- if package /= touchy then stageBinPath stage
else stageLibPath stage <&> (-/- "bin")
-- Likewise for 'unlit'.
path <- if package `elem` [touchy, unlit]
then stageLibPath stage <&> (-/- "bin")
else stageBinPath stage
pgm <- programName context
return $ path -/- pgm <.> exe
......
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