From a71d7945a5447990c094dbbfc0e2f3f5d26e7e6f Mon Sep 17 00:00:00 2001 From: Ian Lynagh Date: Sun, 3 May 2009 20:18:12 +0000 Subject: [PATCH] More bootstrapping rules --- rules/hs-suffix-rules-srcdir.mk | 3 +++ rules/hs-suffix-rules.mk | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk index e2b8c39..aaf22d6 100644 --- a/rules/hs-suffix-rules-srcdir.mk +++ b/rules/hs-suffix-rules-srcdir.mk @@ -57,6 +57,9 @@ endif $1/$2/build/%.$$($3_osuf) : $1/$4/%.hc $$(CC) $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@ +$1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc + $$(CC) $$($1_$2_$3_ALL_CC_OPTS) -c $$< -o $$@ + # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc # $$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@ # diff --git a/rules/hs-suffix-rules.mk b/rules/hs-suffix-rules.mk index aadb729..263cbb2 100644 --- a/rules/hs-suffix-rules.mk +++ b/rules/hs-suffix-rules.mk @@ -13,6 +13,8 @@ define hs-suffix-rules # args: $1 = dir, $2 = distdir, $3 = way +ifneq "$$(BootingFromHc)" "YES" + $1/$2/build/%.$$($3_hcsuf) : $1/$2/build/%.hs $$($1_$2_HC_DEP) $$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -C $$< -o $$@ @@ -25,5 +27,7 @@ $1/$2/build/%.$$($3_hcsuf) : $1/$2/build/autogen/%.hs $$($1_$2_HC_DEP) $1/$2/build/%.$$($3_osuf) : $1/$2/build/autogen/%.hs $$($1_$2_HC_DEP) $$($1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@ +endif + endef # hs-suffix-rules -- 1.7.10.4