[commit: ghc] master: rts: Enable USDT probes object on Linux (69a0f01)

[git at git.haskell.org]

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

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

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

commit 69a0f01674e58e5acd0ae250770676f47ab1ac68
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Aug 17 10:28:39 2017 -0400

    rts: Enable USDT probes object on Linux
    
    Summary: The dtrace utility shipped with Debian expects this.
    
    Reviewers: austin, simonmar
    
    Reviewed By: simonmar
    
    Subscribers: rwbarton, thomie
    
    Differential Revision: https://phabricator.haskell.org/D3829


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

69a0f01674e58e5acd0ae250770676f47ab1ac68
 rts/ghc.mk | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 990f4db..e3de93d 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -170,8 +170,12 @@ rts_$1_CMM_OBJS = $$(patsubst rts/%.cmm,rts/dist/build/%.$$($1_osuf),$$(rts_CMM_
 
 rts_$1_OBJS = $$(rts_$1_C_OBJS) $$(rts_$1_S_OBJS) $$(rts_$1_CMM_OBJS)
 
+ifneq "$$(findstring linux solaris2, $(TargetOS_CPP))" ""
+NEED_DTRACE_PROBES_OBJ = YES
+endif
+
 ifeq "$(USE_DTRACE)" "YES"
-ifeq "$(TargetOS_CPP)" "solaris2"
+ifeq "$(NEED_DTRACE_PROBES_OBJ)" "YES"
 # On Darwin we don't need to generate binary containing probes defined
 # in DTrace script, but DTrace on Solaris expects generation of binary
 # from the DTrace probes definitions