Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in / Register
Toggle navigation
Menu
Open sidebar
Glasgow Haskell Compiler
Packages
Cabal
Commits
69e19add
Commit
69e19add
authored
Jul 22, 2016
by
Edward Z. Yang
Browse files
Revert refactor of depLibraryPaths, see #3599.
Signed-off-by:
Edward Z. Yang
<
ezyang@cs.stanford.edu
>
parent
d94ddc0e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Cabal/Distribution/Simple/LocalBuildInfo.hs
View file @
69e19add
...
...
@@ -242,10 +242,25 @@ depLibraryPaths inplace relative lbi clbi = do
relDir
|
executable
=
bindir
installDirs
|
otherwise
=
libdir
installDirs
let
-- TODO: this is kind of inefficient
internalDeps
=
[
uid
|
(
uid
,
_
)
<-
componentPackageDeps
clbi
-- Test that it's internal
,
sub_target
<-
allTargetsInBuildOrder
lbi
,
componentUnitId
(
targetCLBI
(
sub_target
))
==
uid
]
internalLibs
=
[
getLibDir
(
targetCLBI
sub_target
)
|
sub_target
<-
neededTargetsInBuildOrder
lbi
internalDeps
]
{-
-- This is better, but it doesn't work, because we may be passed a
-- CLBI which doesn't actually exist, and was faked up when we
-- were building a test suite/benchmark. See #3599 for proposal
-- to fix this.
let internalCLBIs = filter ((/= componentUnitId clbi) . componentUnitId)
. map targetCLBI
$ neededTargetsInBuildOrder lbi [componentUnitId clbi]
internalLibs = map getLibDir internalCLBIs
-}
getLibDir
sub_clbi
|
inplace
=
componentBuildDir
lbi
sub_clbi
|
otherwise
=
libdir
(
absoluteComponentInstallDirs
pkgDescr
lbi
(
componentUnitId
sub_clbi
)
NoCopyDest
)
...
...
Write
Preview
Supports
Markdown
0%
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!
Cancel
Please
register
or
sign in
to comment