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

git at git.haskell.org git at git.haskell.org
Sat Nov 18 07:07:15 UTC 2017


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

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

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

commit 74070bbba956392ac6efd4e159dfb8f76b563615
Author: Moritz Angermann <moritz.angermann at gmail.com>
Date:   Sat Nov 18 15:05:31 2017 +0800

    Fix rts.cabal.in
    
    Overlap with commit 2f463873, resulted in `hooks/LongGCSync.c`
    missing from the `rts.cabal.in` file.  As the `rts.cabal` file is only
    used by hadrian, this did not trigger with the make base build
    system which can do globbing.
    
    Also ignore the `rts.cabal` file, as it's generated by configure
    from the `rts.cabal.in`.


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

74070bbba956392ac6efd4e159dfb8f76b563615
 .gitignore       | 1 +
 rts/rts.cabal.in | 1 +
 2 files changed, 2 insertions(+)

diff --git a/.gitignore b/.gitignore
index 245b2a5..7115798 100644
--- a/.gitignore
+++ b/.gitignore
@@ -166,6 +166,7 @@ _darcs/
 /mk/project.mk
 /mk/project.mk.old
 /mk/validate.mk
+/rts/rts.cabal
 /rts/package.conf.inplace
 /rts/package.conf.inplace.raw
 /rts/package.conf.install
diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in
index 471012d..71aef3d 100644
--- a/rts/rts.cabal.in
+++ b/rts/rts.cabal.in
@@ -379,6 +379,7 @@ library
                eventlog/EventLog.c
                eventlog/EventLogWriter.c
                hooks/FlagDefaults.c
+               hooks/LongGCSync.c
                hooks/MallocFail.c
                hooks/OnExit.c
                hooks/OutOfHeap.c



More information about the ghc-commits mailing list