X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=ghc%2Fcompiler%2FMakefile;h=1db9a456b33ba63299f407451ec2157a9d788c55;hb=b180d2d4959b3b5b8361afc8329f40479176555b;hp=a8afae0ac362db72bda00039ed39ea5bca9f6df0;hpb=18fbcc6f39c27881e9ddd2de7ff9e6475dcb54a8;p=ghc-hetmet.git

diff --git a/ghc/compiler/Makefile b/ghc/compiler/Makefile
index a8afae0..1db9a45 100644
--- a/ghc/compiler/Makefile
+++ b/ghc/compiler/Makefile
@@ -18,11 +18,8 @@
 TOP = ..
 
 # Use GHC for compiling C bits (NB. must be before boilerplate include)
-# NB. this requires BootingFromHc to be set on the make command line!
 #
-ifneq "$(BootingFromHc)" "YES"
 UseGhcForCc = YES
-endif
 
 include $(TOP)/mk/boilerplate.mk
 
@@ -368,7 +365,6 @@ ifeq "$(HOSTPLATFORM)" "hppa1.1-hp-hpux9"
 rename/RnMonad_HC_OPTS 		=  -O2 -O2-for-C
 endif
 
-utils/StringBuffer_HC_OPTS	= -fvia-C -fno-prune-tydecls
 utils/Digraph_HC_OPTS		= -fglasgow-exts 
 
 ifeq "$(bootstrapped)" "YES"
@@ -585,7 +581,10 @@ MKDEPENDHS=$(HC)
 
 # Must do this *after* including target.mk, because $(HS_SRCS) isn't set yet.
 depend :: $(HS_SRCS) $(C_SRCS)
+	touch .depend-BASE
+ifneq "$(BootingFromHc)" "YES"
 	$(MKDEPENDHS) -M -optdep-f -optdep.depend-BASE $(foreach way,$(WAYS),-optdep-s -optdep$(way)) $(foreach obj,$(MKDEPENDHS_OBJ_SUFFICES),-osuf $(obj)) $(MKDEPENDHS_OPTS) $(filter-out -split-objs, $(MKDEPENDHS_HC_OPTS)) $(HS_SRCS)
+endif
 	$(MKDEPENDC) -f .depend-BASE $(MKDEPENDC_OPTS) $(foreach way,$(WAYS),-s $(way)) -- $(CC_OPTS) -- $(C_SRCS) 
 	$(PERL) -pe 'binmode(stdin); binmode(stdout); s@^(\S*\.o)@stage$(stage)/$$1@g; s@(\S*\.hi)@stage$(stage)/$$1@g' <.depend-BASE >.depend-$(stage)
 # The binmode stuff tells perl not to add stupid ^M's to the output