Skip to content

Report dist path as HASKELL_DIST_DIR env variable #524

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
snoyberg merged 1 commit into from
Jul 6, 2015
Merged

Report dist path as HASKELL_DIST_DIR env variable #524

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
5 changes: 5 additions & 0 deletions src/Stack/Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,7 @@ import Path.IO
import Prelude -- Fix AMP warning
import Safe (headMay, readMay)
import Stack.Build.Types
import Stack.Constants (distRelativeDir)
import Stack.GhcPkg (createDatabase, getCabalPkgVer, getGlobalDB)
import Stack.Solver (getGhcVersion)
import Stack.Types
Expand Down Expand Up @@ -150,6 +151,7 @@ setupEnv = do
env1 = Map.delete "GHC_PACKAGE_PATH"
$ Map.delete "HASKELL_PACKAGE_SANDBOX"
$ Map.delete "HASKELL_PACKAGE_SANDBOXES"
$ Map.delete "HASKELL_DIST_DIR"
env0

menv1 <- mkEnvOverride platform env1
Expand Down Expand Up @@ -179,6 +181,8 @@ setupEnv = do
, [toFilePathNoTrailingSlash globalDB]
]

distDir <- runReaderT distRelativeDir envConfig0

executablePath <- liftIO getExecutablePath

envRef <- liftIO $ newIORef Map.empty
Expand Down Expand Up @@ -210,6 +214,7 @@ setupEnv = do
[ toFilePathNoTrailingSlash deps
, ""
])
$ Map.insert "HASKELL_DIST_DIR" (T.pack $ toFilePathNoTrailingSlash distDir)
$ env1
!() <- atomicModifyIORef envRef $ \m' ->
(Map.insert es eo m', ())
Expand Down