From f297744c392bf7fa10d8b692de7194dcad0b9afd Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 16 Jan 2011 18:03:06 +0000 Subject: [PATCH] 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 --- mk/config.mk.in | 3 +++ rts/ghc.mk | 6 +++--- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/mk/config.mk.in b/mk/config.mk.in index 3fc0853..c4a0229 100644 --- a/mk/config.mk.in +++ b/mk/config.mk.in @@ -619,6 +619,9 @@ TR = tr SHELL = /bin/sh HaveDtrace = @HaveDtrace@ +# There are problems with dtrace on 64bit 10.5. For now at least, we +# just turn dtrace off unless you override USE_DTRACE +USE_DTRACE = NO DTRACE = @DtraceCmd@ LD = @LdCmd@ diff --git a/rts/ghc.mk b/rts/ghc.mk index 8825219..0721e45 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 -- 1.7.10.4