patches/patch-al

   1 $NetBSD$
   2
   3 --- rts/ghc.mk.orig     2010-11-23 11:49:14.000000000 +0000
   4 +++ rts/ghc.mk
   5 @@ -425,12 +425,14 @@ rts_dist_MKDEPENDC_OPTS += -DPROFILING -
   6  ifeq "$(HaveDtrace)" "YES"
   7
   8  rts_dist_MKDEPENDC_OPTS += -Irts/dist/build
   9 +rts_CC_OPTS += -Irts/dist/build
  10
  11  endif
  12
  13  $(eval $(call build-dependencies,rts,dist,1))
  14
  15  $(rts_dist_depfile_c_asm) : libffi/dist-install/build/ffi.h $(DTRACEPROBES_H)
  16 +rts/Trace.h : $(DTRACEPROBES_H)
  17
  18  #-----------------------------------------------------------------------------
  19  # libffi stuff
  20 @@ -450,7 +452,7 @@ rts_HC_OPTS         += -DDTRACE
  21
  22  DTRACEPROBES_SRC = rts/RtsProbes.d
  23  $(DTRACEPROBES_H): $(DTRACEPROBES_SRC) includes/ghcplatform.h | $(dir $@)/.
  24 -       "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C -h -o $@ -s $<
  25 +       env PATH=/usr/bin "$(DTRACE)" $(filter -I%,$(rts_CC_OPTS)) -C -h -o $@ -s $<
  26
  27  endif
  28