From fdc0cd3d4ab693867f79d9c741c9387d66782c01 Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Mon, 4 May 2009 14:25:11 +0000 Subject: [PATCH] Bootstrapping fixes --- ghc.mk | 4 ++++ rules/hs-suffix-rules-srcdir.mk | 8 ++++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/ghc.mk b/ghc.mk index 4406d31..8c33e0e 100644 --- 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 --- 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 $$@ -- 1.7.10.4