diff options
author | Ian Lynagh <igloo@earth.li> | 2011-01-16 18:03:06 +0000 |
---|---|---|
committer | Ian Lynagh <igloo@earth.li> | 2011-01-16 18:03:06 +0000 |
commit | f297744c392bf7fa10d8b692de7194dcad0b9afd (patch) | |
tree | 8aba26c4deff6f36de7d21bb6c1213d1899962f2 /rts/ghc.mk | |
parent | 2b35afe9eaf4dc01b05729d2cbb9ffbdf30429ff (diff) | |
download | haskell-f297744c392bf7fa10d8b692de7194dcad0b9afd.tar.gz |
Turn off dtrace unless you override USE_DTRACE
There are problems with dtrace on 64bit 10.5. For now at least, we
just turn dtrace off unless you override USE_DTRACE
Diffstat (limited to 'rts/ghc.mk')
-rw-r--r-- | rts/ghc.mk | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/rts/ghc.mk b/rts/ghc.mk index 8825219225..0721e45edd 100644 --- a/rts/ghc.mk +++ b/rts/ghc.mk @@ -69,7 +69,7 @@ rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(dir $$@)/. rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h) -ifeq "$(HaveDtrace)" "YES" +ifeq "$(USE_DTRACE)" "YES" DTRACEPROBES_H = rts/dist/build/RtsProbes.h rts_H_FILES += $(DTRACEPROBES_H) endif @@ -434,7 +434,7 @@ rts_dist_C_FILES = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) $(rts_S_SRCS) # TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now. rts_dist_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG -ifeq "$(HaveDtrace)" "YES" +ifeq "$(USE_DTRACE)" "YES" rts_dist_MKDEPENDC_OPTS += -Irts/dist/build @@ -455,7 +455,7 @@ rts_LD_OPTS += -Llibffi/build/include # ----------------------------------------------------------------------------- # compile dtrace probes if dtrace is supported -ifeq "$(HaveDtrace)" "YES" +ifeq "$(USE_DTRACE)" "YES" rts_CC_OPTS += -DDTRACE rts_HC_OPTS += -DDTRACE |