diff options
| author | Ian Lynagh <igloo@earth.li> | 2009-05-03 20:18:12 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2009-05-03 20:18:12 +0000 |
| commit | a71d7945a5447990c094dbbfc0e2f3f5d26e7e6f (patch) | |
| tree | afe51288fa49065ff93d05559c145a5026335809 /rules | |
| parent | cd7593af81c290085eb857d5b2d05aeaf9cb2cf0 (diff) | |
| download | haskell-a71d7945a5447990c094dbbfc0e2f3f5d26e7e6f.tar.gz | |
More bootstrapping rules
Diffstat (limited to 'rules')
| -rw-r--r-- | rules/hs-suffix-rules-srcdir.mk | 3 | ||||
| -rw-r--r-- | rules/hs-suffix-rules.mk | 4 |
2 files changed, 7 insertions, 0 deletions
diff --git a/rules/hs-suffix-rules-srcdir.mk b/rules/hs-suffix-rules-srcdir.mk index e2b8c39f1b..aaf22d696d 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 aadb72917a..263cbb2f4f 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 |