Commit 91fabb30 authored by Mikhail Glushenkov's avatar Mikhail Glushenkov
Browse files

Use absolute paths when passing install dirs to the setup script.

Before: '--libsubdir=$arch-$os-$compiler/$pkgid'.
After:  '--libsubdir=i386-linux-ghc-7.4.2/lifted-base-'.
parent cf07c9d1
......@@ -1232,12 +1232,14 @@ installUnpackedPackage verbosity buildLimit installLock numJobs
addDefaultInstallDirs configFlags' = do
defInstallDirs <- InstallDirs.defaultInstallDirs flavor userInstall False
return $ configFlags' {
configInstallDirs = InstallDirs.combineInstallDirs combine
configInstallDirs = fmap Cabal.Flag .
InstallDirs.substituteInstallDirTemplates env $
InstallDirs.combineInstallDirs fromFlagOrDefault
defInstallDirs (configInstallDirs configFlags)
CompilerId flavor _ = compid
combine = \d f -> Cabal.Flag $ fromFlagOrDefault d f
env = initialPathTemplateEnv pkgid compid platform
userInstall = fromFlagOrDefault defaultUserInstall
(configUserInstall configFlags')
Supports Markdown
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