diff options
| author | Andrey Mokhov <andrey.mokhov@gmail.com> | 2018-04-13 11:33:30 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-04-13 11:33:36 -0400 |
| commit | f78df87c3857c128c9126f1979fbacf84ac5cd1a (patch) | |
| tree | 631fd3a9e56f1c111ad873ad3f1e89095f453f10 | |
| parent | 120a261773d3da7ef81d1ba9e41733afbadefe1d (diff) | |
| download | haskell-f78df87c3857c128c9126f1979fbacf84ac5cd1a.tar.gz | |
Fix rts.cabal.in
On Windows the FFI library is called `libCffi-6` instead of `libCffi`.
This needs to be reflected in `rts.cabal.in` as otherwise we cannot
properly `copy` and `register` the RTS package on Windows.
See https://github.com/snowleopard/hadrian/issues/567
Test Plan: Build GHC using Hadrian. Make build system does not use
`rts.cabal.in`.
Reviewers: bgamari, erikd, simonmar, Phyx
Reviewed By: Phyx
Subscribers: thomie, carter
Differential Revision: https://phabricator.haskell.org/D4590
| -rw-r--r-- | rts/rts.cabal.in | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in index b3cd2b228e..c1efd4ed59 100644 --- a/rts/rts.cabal.in +++ b/rts/rts.cabal.in @@ -34,7 +34,10 @@ library -- expects the unit-id to be -- set without version ghc-options: -this-unit-id rts - extra-bundled-libraries: Cffi + if os(windows) + extra-bundled-libraries: Cffi-6 + else + extra-bundled-libraries: Cffi -- the rts comes in a variety of flavours that ar built outside -- of cabal. The combination of extra-bundled-libraries and -- extra-library-flavours results in the following libraries to |