Finish removing BootingFromHc

6 files changed, 1 insertions, 21 deletions

diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk
index aade4e93af..a8dfc5a722 100644
--- a/rules/build-package-way.mk
+++ b/rules/build-package-way.mk
@@ -43,10 +43,6 @@ endif
 # [inconsistent distdirs].
 $1_$2_$3_DEPS_LIBS=$$(foreach dep,$$($1_$2_DEPS),$$($$(dep)_$(subst stage2,dist-install,$2)_$3_LIB))
 
-ifeq "$$(BootingFromHc)" "YES"
-$1_$2_$3_C_OBJS += $$(shell $$(FIND) $1/$2/build -name "*_stub.c" -print | sed 's/c$$$$/o/')
-endif
-
 $1_$2_$3_NON_HS_OBJS = $$($1_$2_$3_CMM_OBJS) $$($1_$2_$3_C_OBJS)  $$($1_$2_$3_S_OBJS) $$($1_$2_EXTRA_OBJS)
 $1_$2_$3_ALL_OBJS = $$($1_$2_$3_HS_OBJS) $$($1_$2_$3_NON_HS_OBJS)
 
diff --git a/rules/build-prog.mk b/rules/build-prog.mk
index 400c6208f4..3cbd713e8e 100644
--- a/rules/build-prog.mk
+++ b/rules/build-prog.mk
@@ -160,9 +160,6 @@ $(call c-objs,$1,$2,$$($1_$2_PROGRAM_WAY))
 $(call hs-objs,$1,$2,$$($1_$2_PROGRAM_WAY))
 
 $1_$2_LINK_WITH_GCC = NO
-ifeq "$$(BootingFromHc)" "YES"
-$1_$2_LINK_WITH_GCC = YES
-endif
 
 ifeq "$$($1_$2_$$($1_$2_PROGRAM_WAY)_HS_OBJS)" ""
 # We don't want to link the GHC RTS into C-only programs. There's no
diff --git a/rules/c-suffix-rules.mk b/rules/c-suffix-rules.mk
index 6d4bfe1755..628546c077 100644
--- a/rules/c-suffix-rules.mk
+++ b/rules/c-suffix-rules.mk
@@ -19,8 +19,7 @@ define c-suffix-rules
 
 ifneq "$$(BINDIST)" "YES"
 
-# UseGhcForCc is only relevant when not booting from HC files.
-ifeq "$4 $$(BootingFromHc)" "YES NO"
+ifeq "$4" "YES"
 
 $1/$2/build/%.$$($3_osuf) : $1/%.c $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP) | $$$$(dir $$$$@)/.
 	$$(call cmd,$1_$2_HC) $$($1_$2_$3_GHC_CC_OPTS) -c $$< -o $$@
diff --git a/rules/cmm-suffix-rules.mk b/rules/cmm-suffix-rules.mk
index 0c8b0716e6..6546f86004 100644
--- a/rules/cmm-suffix-rules.mk
+++ b/rules/cmm-suffix-rules.mk
@@ -20,8 +20,6 @@ define cmm-suffix-rules
 
 ifneq "$$(CLEANING)" "YES"
 
-ifneq "$$(BootingFromHc)" "YES"
-
 $1/$2/build/%.$$($3_way_)o : $1/%.cmm $$(rts_H_FILES) $$(includes_H_FILES) $$(includes_DERIVEDCONSTANTS) $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP) | $$$$(dir $$$$@)/.
 	$$(call cmd,$1_$2_HC) $$($1_$2_$3_MOST_HC_OPTS) -c $$< -o $$@
 
@@ -50,7 +48,5 @@ $1/$2/build/%.$$($3_way_)hc : $1/$2/build/%.cmm $$(rts_H_FILES) $$(includes_H_FI
 
 endif
 
-endif
-
 endef
 
diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk
index 776d1ce0f6..2a0480f0c3 100644
--- a/rules/hs-suffix-rules-srcdir.mk
+++ b/rules/hs-suffix-rules-srcdir.mk
@@ -18,8 +18,6 @@ define hs-suffix-rules-srcdir
 
 ifneq "$$(BINDIST)" "YES"
 
-ifneq "$$(BootingFromHc)" "YES"
-
 $1/$2/build/%.hs : $1/$4/%.ly | $$$$(dir $$$$@)/.
 	$$(call cmd,HAPPY) $$($1_$2_$3_ALL_HAPPY_OPTS) $$< -o $$@
 
@@ -54,8 +52,6 @@ $1/$2/build/%.$$($3_hcsuf) : $1/$4/%.lhs $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP) $$
 
 $(call hi-rule,$1/$4,$1/$2/build,$3)
 
-endif
-
 # XXX: for some reason these get used in preference to the direct
 # .hs->.o rule, I don't know why --SDM
 
@@ -88,12 +84,10 @@ $1/$2/build/%.$$($3_way_)o-boot : $1/$4/%.hs-boot $$(LAX_DEPS_FOLLOW) $$($1_$2_H
 $1/$2/build/%.$$($3_way_)o-boot : $1/$4/%.lhs-boot $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP) $$($1_$2_PKGDATA_DEP)
 	$$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@
 
-ifneq "$$(BootingFromHc)" "YES"
 # stubs are automatically generated and compiled by GHC
 
 $1/$2/build/%_stub.$$($3_osuf): $1/$2/build/%.$$($3_osuf)
 	@:
-endif
 
 endif
 
diff --git a/rules/hs-suffix-rules.mk b/rules/hs-suffix-rules.mk
index fead7d1d41..459ee372e9 100644
--- a/rules/hs-suffix-rules.mk
+++ b/rules/hs-suffix-rules.mk
@@ -14,7 +14,6 @@
 define hs-suffix-rules  # args: $1 = dir,  $2 = distdir, $3 = way
 
 ifneq "$$(BINDIST)" "YES"
-ifneq "$$(BootingFromHc)" "YES"
 
 $1/$2/build/%.$$($3_hcsuf) : $1/$2/build/%.hs $$(LAX_DEPS_FOLLOW) $$($1_$2_HC_DEP)
 	$$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -C $$< -o $$@
@@ -32,7 +31,6 @@ $(call hi-rule,$1/$2/build,$1/$2/build,$3)
 $(call hi-rule,$1/$2/build/autogen,$1/$2/build,$3)
 
 endif
-endif
 
 $$(foreach dir,$$($1_$2_HS_SRC_DIRS),\
   $$(eval $$(call hs-suffix-rules-srcdir,$1,$2,$3,$$(dir))))