Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
C
Cabal
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Locked Files
Requirements
Requirements
List
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Security & Compliance
Security & Compliance
Dependency List
License Compliance
Operations
Operations
Environments
Packages & Registries
Packages & Registries
Package Registry
Container Registry
Analytics
Analytics
CI / CD
Insights
Issue
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Jobs
Commits
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
900721f9
Unverified
Commit
900721f9
authored
Oct 23, 2018
by
Mikhail Glushenkov
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
s/lirbaries/libraries/ [ci skip]
parent
b308a709
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
7 additions
and
7 deletions
+7
-7
Cabal/Distribution/Simple/BuildPaths.hs
Cabal/Distribution/Simple/BuildPaths.hs
+1
-1
Cabal/Distribution/Simple/Doctest.hs
Cabal/Distribution/Simple/Doctest.hs
+1
-1
Cabal/Distribution/Types/BuildInfo.hs
Cabal/Distribution/Types/BuildInfo.hs
+3
-3
Cabal/doc/developing-packages.rst
Cabal/doc/developing-packages.rst
+1
-1
cabal-install/Distribution/Client/ProjectBuilding.hs
cabal-install/Distribution/Client/ProjectBuilding.hs
+1
-1
No files found.
Cabal/Distribution/Simple/BuildPaths.hs
View file @
900721f9
...
...
@@ -196,7 +196,7 @@ mkLibName lib = mkGenericStaticLibName (getHSLibraryName lib)
mkProfLibName
::
UnitId
->
String
mkProfLibName
lib
=
mkGenericStaticLibName
(
getHSLibraryName
lib
++
"_p"
)
-- | Create a library name for a shared li
rb
ary from a given name.
-- | Create a library name for a shared li
br
ary from a given name.
-- Prepends 'lib' and appends the '-<compilerFlavour><compilerVersion>'
-- as well as the shared library extension.
mkGenericSharedLibName
::
Platform
->
CompilerId
->
String
->
String
...
...
Cabal/Distribution/Simple/Doctest.hs
View file @
900721f9
...
...
@@ -136,7 +136,7 @@ mkDoctestArgs verbosity tmp lbi clbi inFiles bi = do
then
return
vanillaOpts
else
if
withSharedLib
lbi
then
return
sharedOpts
else
die'
verbosity
$
"Must have vanilla or shared li
rb
aries "
else
die'
verbosity
$
"Must have vanilla or shared li
br
aries "
++
"enabled in order to run doctest"
ghcVersion
<-
maybe
(
die'
verbosity
"Compiler has no GHC version"
)
return
...
...
Cabal/Distribution/Types/BuildInfo.hs
View file @
900721f9
...
...
@@ -77,14 +77,14 @@ data BuildInfo = BuildInfo {
extraLibs
::
[
String
],
-- ^ what libraries to link with when compiling a program that uses your package
extraGHCiLibs
::
[
String
],
-- ^ if present, overrides extraLibs when package is loaded with GHCi.
extraBundledLibs
::
[
String
],
-- ^ if present, adds libs to hs-li
rb
aries, which become part of the package.
extraBundledLibs
::
[
String
],
-- ^ if present, adds libs to hs-li
br
aries, which become part of the package.
-- Example: the Cffi library shipping with the rts, alognside the HSrts-1.0.a,.o,...
-- Example 2: a library that is being built by a foreing tool (e.g. rust)
-- and copied and registered together with this library. The
-- logic on how this library is built will have to be encoded in a
-- custom Setup for now. Oherwise cabal would need to lear how to
-- call arbitary li
rb
ary builders.
extraLibFlavours
::
[
String
],
-- ^ Hidden Flag. This set of strings, will be appended to all li
rb
aries when
-- call arbitary li
br
ary builders.
extraLibFlavours
::
[
String
],
-- ^ Hidden Flag. This set of strings, will be appended to all li
br
aries when
-- copying. E.g. [libHS<name>_<flavour> | flavour <- extraLibFlavours]. This
-- should only be needed in very specific cases, e.g. the `rts` package, where
-- there are multiple copies of slightly differently built libs.
...
...
Cabal/doc/developing-packages.rst
View file @
900721f9
...
...
@@ -2435,7 +2435,7 @@ system-dependent values for these fields.
A
list
of
libraries
that
are
supposed
to
be
copied
from
the
build
directory
alongside
the
produced
Haskell
libraries
.
Note
that
you
are
under
the
obligation
to
produce
those
li
rb
aries
in
the
build
are
under
the
obligation
to
produce
those
li
br
aries
in
the
build
directory
(
e
.
g
.
via
a
custom
setup
).
Libraries
listed
here
will
be
included
when
``
copy
``-
ing
packages
and
be
listed
in
the
``
hs
-
libraries
``
of
the
package
configuration
.
...
...
cabal-install/Distribution/Client/ProjectBuilding.hs
View file @
900721f9
...
...
@@ -975,7 +975,7 @@ buildAndInstallUnpackedPackage verbosity
(
renderPackageHashInputs
(
packageHashInputs
pkgshared
pkg
))
-- Ensure that there are no files in `tmpDir`, that are not in `entryDir`
-- While this breaks the prefix-relocatable property of the li
rb
aries
-- While this breaks the prefix-relocatable property of the li
br
aries
-- it is necessary on macOS to stay under the load command limit of the
-- macOS mach-o linker. See also @PackageHash.hashedInstalledPackageIdVeryShort@.
-- We also normalise paths to ensure that there are no different representations
...
...
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