diff options
| author | Matthew Pickering <matthewtpickering@gmail.com> | 2021-05-21 13:06:43 +0100 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2021-05-25 05:52:02 -0400 |
| commit | 11bdf3cdd6efb406839a0ebe33455908a66df805 (patch) | |
| tree | f8824b9dd69edb89b2f5c2bbef5f6d5f2bf7de3e | |
| parent | 50c3061db2d8f8a179519eba8c989f492dd5baa5 (diff) | |
| download | haskell-11bdf3cdd6efb406839a0ebe33455908a66df805.tar.gz | |
Revert "hadrian: Don't always links against libffi"
This reverts commit 673ff667c98eafc89e6746d1ac69d33b8330d755.
| -rw-r--r-- | hadrian/src/Settings/Builders/Ghc.hs | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/hadrian/src/Settings/Builders/Ghc.hs b/hadrian/src/Settings/Builders/Ghc.hs index 1a05681a35..c3dad6d4d7 100644 --- a/hadrian/src/Settings/Builders/Ghc.hs +++ b/hadrian/src/Settings/Builders/Ghc.hs @@ -124,8 +124,9 @@ ghcLinkArgs = builder (Ghc LinkHs) ? do -- are not actually bundled with the rts. Perhaps ffi should be part of -- rts's extra libraries instead of extra bundled libraries in that -- case. Care should be take as to not break the make build. - rtsFfiArg = package rts ? (not useSystemFfi && libffiName' `elem` libs) ? mconcat + rtsFfiArg = package rts ? not useSystemFfi ? mconcat [ arg ("-L" ++ buildPath) + , arg ("-l" ++ libffiName') ] -- This is the -rpath argument that is required for the bindist scenario |