diff --git a/Cabal/ChangeLog.md b/Cabal/ChangeLog.md index fc7a126cf71..60cf2725544 100644 --- a/Cabal/ChangeLog.md +++ b/Cabal/ChangeLog.md @@ -3,6 +3,8 @@ * 'check' reports warnings for various ghc-\*-options fields separately ([#5342](https://github.com/haskell/cabal/issues/5432)). * `KnownExtension`: added new extension `DerivingVia`. + * Add `extra-dynamic-library-flavours`, to specify extra dynamic library + flavours to build and install from a .cabal file. ---- diff --git a/Cabal/Distribution/PackageDescription/Check.hs b/Cabal/Distribution/PackageDescription/Check.hs index f8b8743779f..1a9bbeef723 100644 --- a/Cabal/Distribution/PackageDescription/Check.hs +++ b/Cabal/Distribution/PackageDescription/Check.hs @@ -1277,6 +1277,14 @@ checkCabalVersion pkg = ++ " and 'extra-library-flavours' requires the package " ++ " to specify at least 'cabal-version: >= 2.1'." + , checkVersion [2,5] (any (not . null) $ buildInfoField extraDynLibFlavours) $ + PackageDistInexcusable $ + "The use of 'extra-dynamic-library-flavours' requires the package " + ++ " to specify at least 'cabal-version: >= 2.5'. The flavours are: " + ++ commaSep [ flav + | flavs <- buildInfoField extraDynLibFlavours + , flav <- flavs ] + , checkVersion [2,1] (any (not . null) (buildInfoField virtualModules)) $ PackageDistInexcusable $ diff --git a/Cabal/Distribution/PackageDescription/FieldGrammar.hs b/Cabal/Distribution/PackageDescription/FieldGrammar.hs index 0aedbc3f8c9..c2fb11588b2 100644 --- a/Cabal/Distribution/PackageDescription/FieldGrammar.hs +++ b/Cabal/Distribution/PackageDescription/FieldGrammar.hs @@ -403,6 +403,7 @@ buildInfoFieldGrammar = BuildInfo <*> monoidalFieldAla "extra-ghci-libraries" (alaList' VCat Token) L.extraGHCiLibs <*> monoidalFieldAla "extra-bundled-libraries" (alaList' VCat Token) L.extraBundledLibs <*> monoidalFieldAla "extra-library-flavours" (alaList' VCat Token) L.extraLibFlavours + <*> monoidalFieldAla "extra-dynamic-library-flavours" (alaList' VCat Token) L.extraDynLibFlavours <*> monoidalFieldAla "extra-lib-dirs" (alaList' FSep FilePathNT) L.extraLibDirs <*> monoidalFieldAla "include-dirs" (alaList' FSep FilePathNT) L.includeDirs <*> monoidalFieldAla "includes" (alaList' FSep FilePathNT) L.includes diff --git a/Cabal/Distribution/Simple/GHC.hs b/Cabal/Distribution/Simple/GHC.hs index d22ab2094a0..313e7bb498c 100644 --- a/Cabal/Distribution/Simple/GHC.hs +++ b/Cabal/Distribution/Simple/GHC.hs @@ -1840,7 +1840,12 @@ installLib verbosity lbi targetDir dynlibTargetDir _builtDir _pkg lib clbi = do whenProf $ do installOrdinary builtDir targetDir profileLibName whenGHCi $ installOrdinary builtDir targetDir ghciProfLibName - whenShared $ installShared builtDir dynlibTargetDir sharedLibName + whenShared $ + sequence_ [ installShared builtDir dynlibTargetDir + (mkGenericSharedLibName platform compiler_id (l ++ f)) + | l <- getHSLibraryName uid : extraBundledLibs (libBuildInfo lib) + , f <- "":extraDynLibFlavours (libBuildInfo lib) + ] where builtDir = componentBuildDir lbi clbi @@ -1856,7 +1861,7 @@ installLib verbosity lbi targetDir dynlibTargetDir _builtDir _pkg lib clbi = do else installOrdinaryFile verbosity src dst when (stripLibs lbi) $ Strip.stripLib verbosity - (hostPlatform lbi) (withPrograms lbi) dst + platform (withPrograms lbi) dst installOrdinary = install False installShared = install True @@ -1866,12 +1871,11 @@ installLib verbosity lbi targetDir dynlibTargetDir _builtDir _pkg lib clbi = do >>= installOrdinaryFiles verbosity targetDir compiler_id = compilerId (compiler lbi) + platform = hostPlatform lbi uid = componentUnitId clbi profileLibName = mkProfLibName uid ghciLibName = Internal.mkGHCiLibName uid ghciProfLibName = Internal.mkGHCiProfLibName uid - sharedLibName = (mkSharedLibName (hostPlatform lbi) compiler_id) uid - hasLib = not $ null (allLibModules lib clbi) && null (cSources (libBuildInfo lib)) && null (cxxSources (libBuildInfo lib)) diff --git a/Cabal/Distribution/Types/BuildInfo.hs b/Cabal/Distribution/Types/BuildInfo.hs index 298700c6146..60590ca9da6 100644 --- a/Cabal/Distribution/Types/BuildInfo.hs +++ b/Cabal/Distribution/Types/BuildInfo.hs @@ -88,6 +88,9 @@ data BuildInfo = BuildInfo { -- copying. E.g. [libHS_ | 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. + extraDynLibFlavours :: [String], -- ^ Hidden Flag. This set of strings will be be appended to all /dynamic/ + -- libraries when copying. This is particularly useful with the `rts` package, + -- where we want different dynamic flavours of the RTS library to be installed. extraLibDirs :: [String], includeDirs :: [FilePath], -- ^directories to find .h files includes :: [FilePath], -- ^ The .h files to be found in includeDirs @@ -140,6 +143,7 @@ instance Monoid BuildInfo where extraGHCiLibs = [], extraBundledLibs = [], extraLibFlavours = [], + extraDynLibFlavours = [], extraLibDirs = [], includeDirs = [], includes = [], @@ -186,6 +190,7 @@ instance Semigroup BuildInfo where extraGHCiLibs = combine extraGHCiLibs, extraBundledLibs = combine extraBundledLibs, extraLibFlavours = combine extraLibFlavours, + extraDynLibFlavours = combine extraDynLibFlavours, extraLibDirs = combineNub extraLibDirs, includeDirs = combineNub includeDirs, includes = combineNub includes, diff --git a/Cabal/Distribution/Types/BuildInfo/Lens.hs b/Cabal/Distribution/Types/BuildInfo/Lens.hs index 25e1cc65972..15a2cd53767 100644 --- a/Cabal/Distribution/Types/BuildInfo/Lens.hs +++ b/Cabal/Distribution/Types/BuildInfo/Lens.hs @@ -144,6 +144,10 @@ class HasBuildInfo a where extraLibFlavours = buildInfo . extraLibFlavours {-# INLINE extraLibFlavours #-} + extraDynLibFlavours :: Lens' a [String] + extraDynLibFlavours = buildInfo . extraDynLibFlavours + {-# INLINE extraDynLibFlavours #-} + extraLibDirs :: Lens' a [String] extraLibDirs = buildInfo . extraLibDirs {-# INLINE extraLibDirs #-} @@ -283,6 +287,9 @@ instance HasBuildInfo BuildInfo where extraLibFlavours f s = fmap (\x -> s { T.extraLibFlavours = x }) (f (T.extraLibFlavours s)) {-# INLINE extraLibFlavours #-} + extraDynLibFlavours f s = fmap (\x -> s { T.extraDynLibFlavours = x}) (f (T.extraDynLibFlavours s)) + {-# INLINE extraDynLibFlavours #-} + extraLibDirs f s = fmap (\x -> s { T.extraLibDirs = x }) (f (T.extraLibDirs s)) {-# INLINE extraLibDirs #-} diff --git a/Cabal/doc/file-format-changelog.rst b/Cabal/doc/file-format-changelog.rst index e5eaa66d4db..53fe83bca61 100644 --- a/Cabal/doc/file-format-changelog.rst +++ b/Cabal/doc/file-format-changelog.rst @@ -19,6 +19,13 @@ relative to the respective preceding *published* version. versions of the ``Cabal`` library denote unreleased development branches which have no stability guarantee. +``cabal-version: 2.5`` +---------------------- + +* Added the `extra-dynamic-library-flavours` field to specify non-trivial + variants of dynamic flavours. It is `extra-library-flavours` but for + shared libraries. Mainly useful for GHC's RTS library. + ``cabal-version: 2.4`` ---------------------- diff --git a/Cabal/tests/ParserTests/regressions/Octree-0.5.expr b/Cabal/tests/ParserTests/regressions/Octree-0.5.expr index f3df7cb021b..78325016151 100644 --- a/Cabal/tests/ParserTests/regressions/Octree-0.5.expr +++ b/Cabal/tests/ParserTests/regressions/Octree-0.5.expr @@ -39,6 +39,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -126,6 +127,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -215,6 +217,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/common.expr b/Cabal/tests/ParserTests/regressions/common.expr index c8eaf7f8107..460a6549566 100644 --- a/Cabal/tests/ParserTests/regressions/common.expr +++ b/Cabal/tests/ParserTests/regressions/common.expr @@ -29,6 +29,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -89,6 +90,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/common2.expr b/Cabal/tests/ParserTests/regressions/common2.expr index 96f390014e8..119035b5124 100644 --- a/Cabal/tests/ParserTests/regressions/common2.expr +++ b/Cabal/tests/ParserTests/regressions/common2.expr @@ -34,6 +34,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -100,6 +101,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -179,6 +181,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -241,6 +244,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -299,6 +303,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -361,6 +366,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/elif.expr b/Cabal/tests/ParserTests/regressions/elif.expr index bdcc6ea41e9..0db83600cd7 100644 --- a/Cabal/tests/ParserTests/regressions/elif.expr +++ b/Cabal/tests/ParserTests/regressions/elif.expr @@ -34,6 +34,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -87,6 +88,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/elif2.expr b/Cabal/tests/ParserTests/regressions/elif2.expr index 214e6695eeb..9787045a44e 100644 --- a/Cabal/tests/ParserTests/regressions/elif2.expr +++ b/Cabal/tests/ParserTests/regressions/elif2.expr @@ -34,6 +34,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -89,6 +90,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -142,6 +144,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -197,6 +200,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -250,6 +254,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/encoding-0.8.expr b/Cabal/tests/ParserTests/regressions/encoding-0.8.expr index ef36d7b16b4..623be0feea7 100644 --- a/Cabal/tests/ParserTests/regressions/encoding-0.8.expr +++ b/Cabal/tests/ParserTests/regressions/encoding-0.8.expr @@ -32,6 +32,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/generics-sop.expr b/Cabal/tests/ParserTests/regressions/generics-sop.expr index bb43a40fa0e..d5637aa10f0 100644 --- a/Cabal/tests/ParserTests/regressions/generics-sop.expr +++ b/Cabal/tests/ParserTests/regressions/generics-sop.expr @@ -38,6 +38,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -117,6 +118,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -189,6 +191,7 @@ GenericPackageDescription AutoDeriveTypeable], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -243,6 +246,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -363,6 +367,7 @@ GenericPackageDescription FunctionalDependencies], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -473,6 +478,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -548,6 +554,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/issue-5055.expr b/Cabal/tests/ParserTests/regressions/issue-5055.expr index 20cba5ad841..a76d86c6ea9 100644 --- a/Cabal/tests/ParserTests/regressions/issue-5055.expr +++ b/Cabal/tests/ParserTests/regressions/issue-5055.expr @@ -29,6 +29,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -95,6 +96,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -149,6 +151,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/issue-774.expr b/Cabal/tests/ParserTests/regressions/issue-774.expr index 5cda458c27c..440526e3df4 100644 --- a/Cabal/tests/ParserTests/regressions/issue-774.expr +++ b/Cabal/tests/ParserTests/regressions/issue-774.expr @@ -26,6 +26,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/leading-comma.expr b/Cabal/tests/ParserTests/regressions/leading-comma.expr index e696392f3bd..052c9bfbc08 100644 --- a/Cabal/tests/ParserTests/regressions/leading-comma.expr +++ b/Cabal/tests/ParserTests/regressions/leading-comma.expr @@ -49,6 +49,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/noVersion.expr b/Cabal/tests/ParserTests/regressions/noVersion.expr index 88dd88d8573..c79a98bc507 100644 --- a/Cabal/tests/ParserTests/regressions/noVersion.expr +++ b/Cabal/tests/ParserTests/regressions/noVersion.expr @@ -31,6 +31,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/nothing-unicode.expr b/Cabal/tests/ParserTests/regressions/nothing-unicode.expr index 3fd9b4820df..df4f2bf2415 100644 --- a/Cabal/tests/ParserTests/regressions/nothing-unicode.expr +++ b/Cabal/tests/ParserTests/regressions/nothing-unicode.expr @@ -30,6 +30,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -79,6 +80,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/shake.expr b/Cabal/tests/ParserTests/regressions/shake.expr index 4f289b65147..ca48569a2e0 100644 --- a/Cabal/tests/ParserTests/regressions/shake.expr +++ b/Cabal/tests/ParserTests/regressions/shake.expr @@ -28,6 +28,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -92,6 +93,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -144,6 +146,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -201,6 +204,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -252,6 +256,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -308,6 +313,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -426,6 +432,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -641,6 +648,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -695,6 +703,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -754,6 +763,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -807,6 +817,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -865,6 +876,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -988,6 +1000,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -1173,6 +1186,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -1229,6 +1243,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -1294,6 +1309,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -1348,6 +1364,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -1407,6 +1424,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -1460,6 +1478,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -1518,6 +1537,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -1638,6 +1658,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/spdx-1.expr b/Cabal/tests/ParserTests/regressions/spdx-1.expr index 4ee877c5c40..b0d7fba2f76 100644 --- a/Cabal/tests/ParserTests/regressions/spdx-1.expr +++ b/Cabal/tests/ParserTests/regressions/spdx-1.expr @@ -26,6 +26,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/spdx-2.expr b/Cabal/tests/ParserTests/regressions/spdx-2.expr index 954381d3572..c39b7be4715 100644 --- a/Cabal/tests/ParserTests/regressions/spdx-2.expr +++ b/Cabal/tests/ParserTests/regressions/spdx-2.expr @@ -26,6 +26,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/spdx-3.expr b/Cabal/tests/ParserTests/regressions/spdx-3.expr index 2b13d358f81..2982c30d117 100644 --- a/Cabal/tests/ParserTests/regressions/spdx-3.expr +++ b/Cabal/tests/ParserTests/regressions/spdx-3.expr @@ -26,6 +26,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/th-lift-instances.expr b/Cabal/tests/ParserTests/regressions/th-lift-instances.expr index 0ca3462e93d..33aba1d89a1 100644 --- a/Cabal/tests/ParserTests/regressions/th-lift-instances.expr +++ b/Cabal/tests/ParserTests/regressions/th-lift-instances.expr @@ -63,6 +63,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -215,6 +216,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -331,6 +333,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -397,6 +400,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Just Haskell2010, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], diff --git a/Cabal/tests/ParserTests/regressions/wl-pprint-indef.expr b/Cabal/tests/ParserTests/regressions/wl-pprint-indef.expr index 624803cffa6..c01702714e7 100644 --- a/Cabal/tests/ParserTests/regressions/wl-pprint-indef.expr +++ b/Cabal/tests/ParserTests/regressions/wl-pprint-indef.expr @@ -35,6 +35,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [], @@ -110,6 +111,7 @@ GenericPackageDescription defaultExtensions = [], defaultLanguage = Nothing, extraBundledLibs = [], + extraDynLibFlavours = [], extraFrameworkDirs = [], extraGHCiLibs = [], extraLibDirs = [],