Commit a708401c authored by Mikhail Glushenkov's avatar Mikhail Glushenkov

Formatting.

parent f1ea6036
......@@ -199,7 +199,7 @@ configureSetupScript packageDBs
, usePlatform = Just platform
, usePackageDB = packageDBs'
, usePackageIndex = index'
, useProgramDb = conf
, useProgramDb = conf
, useDistPref = distPref
, useLoggingHandle = Nothing
, useWorkingDir = Nothing
......
......@@ -2170,10 +2170,11 @@ setupHsScriptOptions (ReadyPackage elab@ElaboratedConfiguredPackage{..})
usePackageDB = elabSetupPackageDBStack,
usePackageIndex = Nothing,
useDependencies = [ (uid, srcid)
| ConfiguredId srcid uid <- elabSetupDependencies elab ],
| ConfiguredId srcid uid
<- elabSetupDependencies elab ],
useDependenciesExclusive = True,
useVersionMacros = elabSetupScriptStyle == SetupCustomExplicitDeps,
useProgramDb = pkgConfigCompilerProgs,
useProgramDb = pkgConfigCompilerProgs,
useDistPref = builddir,
useLoggingHandle = Nothing, -- this gets set later
useWorkingDir = Just srcdir,
......
......@@ -156,7 +156,7 @@ data SetupScriptOptions = SetupScriptOptions {
usePlatform :: Maybe Platform,
usePackageDB :: PackageDBStack,
usePackageIndex :: Maybe InstalledPackageIndex,
useProgramDb :: ProgramDb,
useProgramDb :: ProgramDb,
useDistPref :: FilePath,
useLoggingHandle :: Maybe Handle,
useWorkingDir :: Maybe FilePath,
......@@ -226,7 +226,7 @@ defaultSetupScriptOptions = SetupScriptOptions {
useDependencies = [],
useDependenciesExclusive = False,
useVersionMacros = False,
useProgramDb = emptyProgramDb,
useProgramDb = emptyProgramDb,
useDistPref = defaultDistPref,
useLoggingHandle = Nothing,
useWorkingDir = Nothing,
......
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