Merge pull request #10167 from mpickering/wip/prof_dyn

copy: Take into account extra-dyn-lib-flavours when copying bundled library
haskell · Jul 6, 2024 · 5baa0dd · 5baa0dd
2 parents 1837262 + 8ee1fd8
commit 5baa0dd
Showing 1 changed file with 2 additions and 1 deletion.
diff --git 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