Commit f297744c authored by Ian Lynagh's avatar Ian Lynagh
Browse files

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
parent 2b35afe9
...@@ -619,6 +619,9 @@ TR = tr ...@@ -619,6 +619,9 @@ TR = tr
SHELL = /bin/sh SHELL = /bin/sh
HaveDtrace = @HaveDtrace@ 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@ DTRACE = @DtraceCmd@
LD = @LdCmd@ LD = @LdCmd@
......
...@@ -69,7 +69,7 @@ rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(dir $$@)/. ...@@ -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) rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h)
ifeq "$(HaveDtrace)" "YES" ifeq "$(USE_DTRACE)" "YES"
DTRACEPROBES_H = rts/dist/build/RtsProbes.h DTRACEPROBES_H = rts/dist/build/RtsProbes.h
rts_H_FILES += $(DTRACEPROBES_H) rts_H_FILES += $(DTRACEPROBES_H)
endif endif
...@@ -434,7 +434,7 @@ rts_dist_C_FILES = $(rts_C_SRCS) $(rts_thr_EXTRA_C_SRCS) $(rts_S_SRCS) ...@@ -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. # TICKY_TICKY can't be used together, so we omit TICKY_TICKY for now.
rts_dist_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG rts_dist_MKDEPENDC_OPTS += -DPROFILING -DTHREADED_RTS -DDEBUG
ifeq "$(HaveDtrace)" "YES" ifeq "$(USE_DTRACE)" "YES"
rts_dist_MKDEPENDC_OPTS += -Irts/dist/build rts_dist_MKDEPENDC_OPTS += -Irts/dist/build
...@@ -455,7 +455,7 @@ rts_LD_OPTS += -Llibffi/build/include ...@@ -455,7 +455,7 @@ rts_LD_OPTS += -Llibffi/build/include
# ----------------------------------------------------------------------------- # -----------------------------------------------------------------------------
# compile dtrace probes if dtrace is supported # compile dtrace probes if dtrace is supported
ifeq "$(HaveDtrace)" "YES" ifeq "$(USE_DTRACE)" "YES"
rts_CC_OPTS += -DDTRACE rts_CC_OPTS += -DDTRACE
rts_HC_OPTS += -DDTRACE rts_HC_OPTS += -DDTRACE
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment