Bootstrapping fixes

diff --git a/ghc.mk b/ghc.mk
index 4406d31..8c33e0e 100644 (file)
--- a/ghc.mk
+++ b/ghc.mk
@@ -856,6 +856,10 @@ publish-sdist :
        $(call nTimes,10,$(PublishCp) $(SRC_DIST_TARBALL) $(PublishLocation)/dist)
 endif
 
+ifeq "$(GhcUnregisterised)" "YES"
+SRC_CC_OPTS += -DNO_REGS -DUSE_MINIINTERPRETER
+endif
+
 # -----------------------------------------------------------------------------
 # Cleaning
 

diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk
index 72a24b2..a75068b 100644 (file)
--- a/rules/hs-suffix-rules-srcdir.mk
+++ b/rules/hs-suffix-rules-srcdir.mk
@@ -54,11 +54,11 @@ endif
 # XXX: for some reason these get used in preference to the direct
 # .hs->.o rule, I don't know why --SDM
 
-$1/$2/build/%.$$($3_osuf) : $1/$4/%.hc
-       $$(CC) $$($1_$2_$3_ALL_CC_OPTS) -x c -c $$< -o $$@
+$1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatform.h
+       $$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
 
-$1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc
-       $$(CC) $$($1_$2_$3_ALL_CC_OPTS) -x c -c $$< -o $$@
+$1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghcplatform.h
+       $$(CC) $$($1_$2_$3_ALL_CC_OPTS) -Iincludes -x c -c $$< -o $$@
 
 # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc
 #      $$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@