Skip to content
Snippets Groups Projects
Commit 8ee1fd86 authored by Matthew Pickering's avatar Matthew Pickering Committed by Mikolaj
Browse files

copy: Take into account extra-dyn-lib-flavours when copying bundled library

This fixes the DynWay case to match the other cases which take into
account extra-dyn-lib-flavours.
parent 1837262b
No related branches found
No related tags found
No related merge requests found
......@@ -961,7 +961,7 @@ installLib verbosity lbi targetDir dynlibTargetDir _builtDir pkg lib clbi = do
mkGenericSharedBundledLibName
platform
compiler_id
l
(l ++ f)
forM_ files $ \file ->
when (l' `isPrefixOf` file) $ do
isFile <- doesFileExist (i $ builtDir </> makeRelativePathEx file)
......@@ -971,6 +971,7 @@ installLib verbosity lbi targetDir dynlibTargetDir _builtDir pkg lib clbi = do
dynlibTargetDir
file
| l <- extraBundledLibs (libBuildInfo lib)
, f <- "" : extraDynLibFlavours (libBuildInfo lib)
]
where
-- See Note [Symbolic paths] in Distribution.Utils.Path
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment