X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;ds=sidebyside;f=rts%2Fghc.mk;h=7e32454e8ea7cbb35b5e2e90bc83841a0bd2829b;hb=032dd778604f80378823af026a99850141ad6cd3;hp=8825219225ab8565dc876d7be4bb0fbae98de2be;hpb=834a2186da7f4ea29d4984a5f809183cb299754a;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 8825219..7e32454 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -35,12 +35,13 @@ else
 ALL_DIRS += posix
 endif
 
+EXCLUDED_SRCS :=
 EXCLUDED_SRCS += rts/Main.c
 EXCLUDED_SRCS += rts/parallel/SysMan.c
 EXCLUDED_SRCS += $(wildcard rts/Vis*.c)
 
-rts_C_SRCS = $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c)))
-rts_CMM_SRCS = $(wildcard rts/*.cmm)
+rts_C_SRCS := $(filter-out $(EXCLUDED_SRCS),$(wildcard rts/*.c $(foreach dir,$(ALL_DIRS),rts/$(dir)/*.c)))
+rts_CMM_SRCS := $(wildcard rts/*.cmm)
 
 # Don't compile .S files when bootstrapping a new arch
 ifneq "$(PORTING_HOST)" "YES"
@@ -67,9 +68,9 @@ rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c | $$(dir $$@)/.
 rts/dist/build/sm/Scav_thr.c : rts/sm/Scav.c | $$(dir $$@)/.
 	cp $< $@
 
-rts_H_FILES = $(wildcard includes/*.h) $(wildcard rts/*.h)
+rts_H_FILES := $(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 +435,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 +456,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