[commit: ghc] master: Fix rts.cabal.in (f78df87)

git at git.haskell.org git at git.haskell.org
Fri Apr 13 16:07:41 UTC 2018


Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/f78df87c3857c128c9126f1979fbacf84ac5cd1a/ghc

>---------------------------------------------------------------

commit f78df87c3857c128c9126f1979fbacf84ac5cd1a
Author: Andrey Mokhov <andrey.mokhov at gmail.com>
Date:   Fri Apr 13 11:33:30 2018 -0400

    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


>---------------------------------------------------------------

f78df87c3857c128c9126f1979fbacf84ac5cd1a
 rts/rts.cabal.in | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in
index b3cd2b2..c1efd4e 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



More information about the ghc-commits mailing list