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
Glasgow Haskell Compiler
Packages
Cabal
Commits
5021a86a
Commit
5021a86a
authored
8 years ago
by
Edward Z. Yang
Committed by
Edward Z. Yang
8 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Don't wrap 'Installing library' message
Signed-off-by:
Edward Z. Yang
<
ezyang@cs.stanford.edu
>
parent
440b30ff
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
Cabal/Distribution/Simple/Install.hs
+5
-5
5 additions, 5 deletions
Cabal/Distribution/Simple/Install.hs
with
5 additions
and
5 deletions
Cabal/Distribution/Simple/Install.hs
+
5
−
5
View file @
5021a86a
...
...
@@ -35,7 +35,7 @@ import Distribution.Simple.BuildPaths (haddockName, haddockPref)
import
Distribution.Simple.Utils
(
createDirectoryIfMissingVerbose
,
installDirectoryContents
,
installOrdinaryFile
,
isInSearchPath
,
die
,
info
,
notice
,
warn
,
matchDirFileGlob
)
,
die
,
info
,
notice
NoWrap
,
warn
,
matchDirFileGlob
)
import
Distribution.Simple.Compiler
(
CompilerFlavor
(
..
),
compilerFlavor
)
import
Distribution.Simple.Setup
...
...
@@ -165,8 +165,8 @@ copyComponent verbosity pkg_descr lbi (CLib lib) clbi copydest = do
buildPref
=
componentBuildDir
lbi
clbi
case
libName
lib
of
Nothing
->
notice
verbosity
(
"Installing library in "
++
libPref
)
Just
n
->
notice
verbosity
(
"Installing internal library "
++
display
n
++
" in "
++
libPref
)
Nothing
->
notice
NoWrap
verbosity
(
"Installing library in "
++
libPref
)
Just
n
->
notice
NoWrap
verbosity
(
"Installing internal library "
++
display
n
++
" in "
++
libPref
)
-- install include files for all compilers - they may be needed to compile
-- haskell files (using the CPP extension)
...
...
@@ -190,7 +190,7 @@ copyComponent verbosity pkg_descr lbi (CFLib flib) clbi copydest = do
}
=
absoluteComponentInstallDirs
pkg_descr
lbi
(
componentUnitId
clbi
)
copydest
buildPref
=
componentBuildDir
lbi
clbi
notice
verbosity
(
"Installing foreign library "
++
unUnqualComponentName
(
foreignLibName
flib
)
++
" in "
++
flibPref
)
notice
NoWrap
verbosity
(
"Installing foreign library "
++
unUnqualComponentName
(
foreignLibName
flib
)
++
" in "
++
flibPref
)
case
compilerFlavor
(
compiler
lbi
)
of
GHC
->
GHC
.
installFLib
verbosity
lbi
flibPref
buildPref
pkg_descr
flib
...
...
@@ -208,7 +208,7 @@ copyComponent verbosity pkg_descr lbi (CExe exe) clbi copydest = do
uid
=
componentUnitId
clbi
progPrefixPref
=
substPathTemplate
(
packageId
pkg_descr
)
lbi
uid
(
progPrefix
lbi
)
progSuffixPref
=
substPathTemplate
(
packageId
pkg_descr
)
lbi
uid
(
progSuffix
lbi
)
notice
verbosity
(
"Installing executable "
++
display
(
exeName
exe
)
++
" in "
++
binPref
)
notice
NoWrap
verbosity
(
"Installing executable "
++
display
(
exeName
exe
)
++
" in "
++
binPref
)
inPath
<-
isInSearchPath
binPref
when
(
not
inPath
)
$
warn
verbosity
(
"The directory "
++
binPref
...
...
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