diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2021-07-21 09:22:06 -0400 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-07-27 04:47:51 -0400 |
| commit | 63184a71277aa15608659ad20f45b7b0fe9746bc (patch) | |
| tree | 09ebc39bfc16ec045931be9abd39005a144d5bf8 /hadrian/src | |
| parent | dd3c9602fdb0d408509d166cc0bf05777753ca43 (diff) | |
| download | haskell-63184a71277aa15608659ad20f45b7b0fe9746bc.tar.gz | |
rts: Don't declare libCffi as bundled when using system libffi
Previously the rts's cabal file would claim that it bundled libffi, even
if we are using the system's libffi. Fixes #19869.
Diffstat (limited to 'hadrian/src')
| -rw-r--r-- | hadrian/src/Settings/Packages.hs | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/hadrian/src/Settings/Packages.hs b/hadrian/src/Settings/Packages.hs index 3b722e05a9..1a3d191c99 100644 --- a/hadrian/src/Settings/Packages.hs +++ b/hadrian/src/Settings/Packages.hs @@ -245,6 +245,7 @@ rtsPackageArgs = package rts ? do way <- getWay path <- getBuildPath top <- expr topDirectory + useSystemFfi <- expr $ flag UseSystemFfi libffiName <- expr libffiLibraryName ffiIncludeDir <- getSetting FfiIncludeDir ffiLibraryDir <- getSetting FfiLibDir @@ -355,6 +356,7 @@ rtsPackageArgs = package rts ? do , any (wayUnit Debug) rtsWays `cabalFlag` "debug" , any (wayUnit Logging) rtsWays `cabalFlag` "logging" , any (wayUnit Dynamic) rtsWays `cabalFlag` "dynamic" + , useSystemFfi `cabalFlag` "use-system-libffi" , useLibffiForAdjustors `cabalFlag` "libffi-adjustors" , Debug `wayUnit` way `cabalFlag` "find-ptr" ] |