Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
What's new
10
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
a708401c
Commit
a708401c
authored
Sep 06, 2016
by
Mikhail Glushenkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Formatting.
parent
f1ea6036
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
6 additions
and
5 deletions
+6
-5
cabal-install/Distribution/Client/Configure.hs
cabal-install/Distribution/Client/Configure.hs
+1
-1
cabal-install/Distribution/Client/ProjectPlanning.hs
cabal-install/Distribution/Client/ProjectPlanning.hs
+3
-2
cabal-install/Distribution/Client/SetupWrapper.hs
cabal-install/Distribution/Client/SetupWrapper.hs
+2
-2
No files found.
cabal-install/Distribution/Client/Configure.hs
View file @
a708401c
...
...
@@ -199,7 +199,7 @@ configureSetupScript packageDBs
,
usePlatform
=
Just
platform
,
usePackageDB
=
packageDBs'
,
usePackageIndex
=
index'
,
useProgramDb
=
conf
,
useProgramDb
=
conf
,
useDistPref
=
distPref
,
useLoggingHandle
=
Nothing
,
useWorkingDir
=
Nothing
...
...
cabal-install/Distribution/Client/ProjectPlanning.hs
View file @
a708401c
...
...
@@ -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
,
...
...
cabal-install/Distribution/Client/SetupWrapper.hs
View file @
a708401c
...
...
@@ -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
,
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment