[commit: ghc] master: rts.cabal.in: advertise new default profiling ways for hadrian (5d67d06)

git at git.haskell.org git at git.haskell.org
Tue Sep 11 19:59:36 UTC 2018


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

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

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

commit 5d67d069608f04b4c5eeee73b44bf27562adc5a3
Author: Alp Mestanogullari <alp at well-typed.com>
Date:   Tue Sep 11 20:45:43 2018 +0200

    rts.cabal.in: advertise new default profiling ways for hadrian
    
    Summary:
    D5140 makes us build some new profiling ways by default, but since it
    is not advertised in rts.cabal, hadrian doesn't know about that. This patch
    fixes this and successfully lets hadrian build those flavours of libHSrts.
    
    Test Plan: hadrian/build.sh --flavour=perf
    
    Reviewers: bgamari, erikd, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: rwbarton, carter
    
    Differential Revision: https://phabricator.haskell.org/D5142


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

5d67d069608f04b4c5eeee73b44bf27562adc5a3
 rts/rts.cabal.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/rts/rts.cabal.in b/rts/rts.cabal.in
index d509953..e09c054 100644
--- a/rts/rts.cabal.in
+++ b/rts/rts.cabal.in
@@ -51,14 +51,14 @@ library
     -- libCffi_thr libCffi_thr_debug libCffi_thr_l libCffi_thr_p
     extra-library-flavours: _debug _l _thr _thr_debug _thr_l
 
-    -- The make build system seems to be doing something "magic"/special
+    -- The make build system does something special in config.mk.in
     -- for generating profiled builds of those libraries, but we need to
     -- be transparent for hadrian which gets information about the rts
     -- "package" through Cabal and this cabal file. We therefore declare
-    -- two profiling-enabled flavours to be available when passing the
+    -- several profiling-enabled flavours to be available when passing the
     -- 'profiling' flag when configuring the RTS from hadrian, using Cabal.
     if flag(profiling)
-      extra-library-flavours: _p _thr_p
+      extra-library-flavours: _p _thr_p _debug_p _thr_debug_p
 
     exposed: True
     exposed-modules:



More information about the ghc-commits mailing list