Skip to content
GitLab
Explore
Sign in
Register
Primary navigation
Search or go to…
Project
C
Cabal
Manage
Activity
Members
Code
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Analyze
Contributor analytics
CI/CD analytics
Repository analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Haskell
Cabal
Commits
fecabc25
Commit
fecabc25
authored
10 years ago
by
tibbe
Browse files
Options
Downloads
Plain Diff
Merge branch '1.18' of
https://github.com/ezyang/cabal
into 1.18
parents
ece909bf
b14a493a
Loading
Loading
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Cabal/Distribution/Simple/Build.hs
+14
-8
14 additions, 8 deletions
Cabal/Distribution/Simple/Build.hs
with
14 additions
and
8 deletions
Cabal/Distribution/Simple/Build.hs
+
14
−
8
View file @
fecabc25
...
...
@@ -75,6 +75,7 @@ import qualified Distribution.InstalledPackageInfo as IPI
import
qualified
Distribution.ModuleName
as
ModuleName
import
Distribution.ModuleName
(
ModuleName
)
import
Distribution.Simple.Program
(
ghcPkgProgram
)
import
Distribution.Simple.Setup
(
BuildFlags
(
..
),
ReplFlags
(
..
),
fromFlag
)
import
Distribution.Simple.BuildTarget
...
...
@@ -91,6 +92,7 @@ import Distribution.Simple.LocalBuildInfo
,
inplacePackageId
,
LibraryName
(
..
)
)
import
Distribution.Simple.Program.Types
import
Distribution.Simple.Program.Db
import
qualified
Distribution.Simple.Program.HcPkg
as
HcPkg
import
Distribution.Simple.BuildPaths
(
autogenModulesDir
,
autogenModuleName
,
cppHeaderName
,
exeExtension
)
import
Distribution.Simple.Register
...
...
@@ -116,7 +118,7 @@ import Control.Monad
import
System.FilePath
(
(
</>
),
(
<.>
)
)
import
System.Directory
(
getCurrentDirectory
)
(
getCurrentDirectory
,
removeDirectoryRecursive
,
doesDirectoryExist
)
-- -----------------------------------------------------------------------------
-- |Build the libraries and executables in this package.
...
...
@@ -141,7 +143,8 @@ build pkg_descr lbi flags suffixes = do
-- Only bother with this message if we're building the whole package
setupMessage
verbosity
"Building"
(
packageId
pkg_descr
)
internalPackageDB
<-
createInternalPackageDB
distPref
let
Just
ghcPkgProg
=
lookupProgram
ghcPkgProgram
(
withPrograms
lbi
)
internalPackageDB
<-
createInternalPackageDB
verbosity
ghcPkgProg
distPref
withComponentsInBuildOrder
pkg_descr
lbi
componentsToBuild
$
\
comp
clbi
->
let
bi
=
componentBuildInfo
comp
...
...
@@ -177,7 +180,8 @@ repl pkg_descr lbi flags suffixes args = do
initialBuildSteps
distPref
pkg_descr
lbi
verbosity
internalPackageDB
<-
createInternalPackageDB
distPref
let
Just
ghcPkgProg
=
lookupProgram
ghcPkgProgram
(
withPrograms
lbi
)
internalPackageDB
<-
createInternalPackageDB
verbosity
ghcPkgProg
distPref
let
lbiForComponent
comp
lbi'
=
lbi'
{
withPackageDB
=
withPackageDB
lbi
++
[
internalPackageDB
],
...
...
@@ -435,11 +439,13 @@ benchmarkExeV10asExe Benchmark{} _ = error "benchmarkExeV10asExe: wrong kind"
-- | Initialize a new package db file for libraries defined
-- internally to the package.
createInternalPackageDB
::
FilePath
->
IO
PackageDB
createInternalPackageDB
distPref
=
do
let
dbFile
=
distPref
</>
"package.conf.inplace"
packageDB
=
SpecificPackageDB
dbFile
writeFile
dbFile
"[]"
createInternalPackageDB
::
Verbosity
->
ConfiguredProgram
->
FilePath
->
IO
PackageDB
createInternalPackageDB
verbosity
ghcPkgProg
distPref
=
do
let
dbDir
=
distPref
</>
"package.conf.inplace"
packageDB
=
SpecificPackageDB
dbDir
exists
<-
doesDirectoryExist
dbDir
when
exists
$
removeDirectoryRecursive
dbDir
HcPkg
.
init
verbosity
ghcPkgProg
dbDir
return
packageDB
addInternalBuildTools
::
PackageDescription
->
LocalBuildInfo
->
BuildInfo
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment