X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rts%2Fghc.mk;h=a14da3bb28c0262b022f14615a92b473edf7310a;hb=aecccd3eae278f4bcc9fc89c9250f889a66d5ded;hp=7db99764a19bfee388ce0ced350c435cfe0d59ab;hpb=fa0cd53b30a261ce282757c12c775e7d6194fd62;p=ghc-hetmet.git

diff --git a/rts/ghc.mk b/rts/ghc.mk
index 7db9976..a14da3b 100644
--- a/rts/ghc.mk
+++ b/rts/ghc.mk
@@ -63,7 +63,6 @@ endif
 rts_AUTO_APPLY_CMM = rts/dist/build/AutoApply.cmm
 
 $(rts_AUTO_APPLY_CMM): $(GENAPPLY_INPLACE)
-	"$(RM)" $(RM_OPTS) $@
 	"$(GENAPPLY_INPLACE)" >$@
 
 rts/dist/build/sm/Evac_thr.c : rts/sm/Evac.c
@@ -83,48 +82,6 @@ rts/libs.depend : $(GHC_PKG_INPLACE)
 #-----------------------------------------------------------------------------
 # Building one way
 
-define cmm-suffix-rules
-# $1 = dir
-# $2 = distdir
-# $3 = way
-
-# .cmm files depend on all the .h files, to a first approximation.
-
-ifneq "$$(CLEANING)" "YES"
-
-ifneq "$$(BootingFromHc)" "YES"
-
-$1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-	"$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
-
-$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-	"$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
-
-$1/$2/build/%.$$($3_way_)hc : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-	"$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
-
-$1/$2/build/%.$$($3_way_)hc : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-	"$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
-
-$1/$2/build/%.$$($3_way_)s : $1/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-	"$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
-
-$1/$2/build/%.$$($3_way_)s : $1/$2/build/%.cmm $$(rts_H_FILES) $$($1_$2_HC)
-	"$$($1_$2_HC)" $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
-
-endif
-
-$1/$2/build/%.$$($3_way_)o : $1/%.hc
-	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
-
-$1/$2/build/%.$$($3_way_)o : $1/$2/build/%.hc
-	"$$(CC)" $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
-
-endif
-
-endef
-
-
 define build-rts-way # args: $1 = way
 
 # The per-way CC_OPTS
@@ -364,28 +321,6 @@ $(eval $(call build-dependencies,rts,dist))
 
 $(rts_dist_depfile) : libffi/ffi.h
 
-# -----------------------------------------------------------------------------
-
-# Need to get the GMP vars in through CPP to package.conf.in, and put
-# quotes around each element.
-
-rts_PACKAGE_CPP_OPTS += -DGMP_INCLUDE_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_INCLUDE_DIRS))))'
-rts_PACKAGE_CPP_OPTS += -DGMP_LIB_DIRS='$(subst $(space),$(comma),$(patsubst %,"%",$(strip $(GMP_LIB_DIRS))))'
-
-ifneq "$(GMP_INCLUDE_DIRS)" ""
-rts_HC_OPTS += -I$(GMP_INCLUDE_DIRS)
-rts_CC_OPTS += -I$(GMP_INCLUDE_DIRS)
-rts_HSC2HS_OPTS += -I$(GMP_INCLUDE_DIRS)
-endif
-ifneq "$(GMP_LIB_DIRS)" ""
-rts_LD_OPTS += -L$(GMP_LIB_DIRS)
-endif
-
-rts_CC_OPTS     += -Igmp/gmpbuild
-rts_HC_OPTS     += -Igmp/gmpbuild
-rts_HSC2HS_OPTS += -Igmp/gmpbuild
-rts_LD_OPTS     += -Lgmp/gmpbuild
-
 #-----------------------------------------------------------------------------
 # libffi stuff