From 8ee1fd867a6223c6f837f9b206e7293c975e8183 Mon Sep 17 00:00:00 2001 From: Matthew Pickering Date: Tue, 2 Jul 2024 09:33:04 +0100 Subject: [PATCH] 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. --- Cabal/src/Distribution/Simple/GHC.hs | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Cabal/src/Distribution/Simple/GHC.hs b/Cabal/src/Distribution/Simple/GHC.hs index 8d7dda4de34..3ce66bb38bc 100644 --- a/Cabal/src/Distribution/Simple/GHC.hs +++ b/Cabal/src/Distribution/Simple/GHC.hs @@ -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