diff options
| -rw-r--r-- | rules/build-package-way.mk | 2 | ||||
| -rw-r--r-- | rules/build-prog.mk | 2 | ||||
| -rw-r--r-- | rules/distdir-way-opts.mk | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/rules/build-package-way.mk b/rules/build-package-way.mk index a5b47b0676..95ec21b6b7 100644 --- a/rules/build-package-way.mk +++ b/rules/build-package-way.mk @@ -13,7 +13,7 @@ define build-package-way # $1 = dir, $2 = distdir, $3 = way, $4 = stage -$(call distdir-way-opts,$1,$2,$3) +$(call distdir-way-opts,$1,$2,$3,$4) $(call hs-suffix-rules,$1,$2,$3) $$(foreach dir,$$($1_$2_HS_SRC_DIRS),\ $$(eval $$(call hs-suffix-rules-srcdir,$1,$2,$3,$$(dir)))) diff --git a/rules/build-prog.mk b/rules/build-prog.mk index e4c0e6a595..b975f4956f 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -84,7 +84,7 @@ $(call build-dependencies,$1,$2) # --- IMPLICIT RULES # Just the 'v' way for programs -$(call distdir-way-opts,$1,$2,v) +$(call distdir-way-opts,$1,$2,v,$3) $(call c-suffix-rules,$1,$2,v,YES) diff --git a/rules/distdir-way-opts.mk b/rules/distdir-way-opts.mk index dea172733c..3fc8813ebf 100644 --- a/rules/distdir-way-opts.mk +++ b/rules/distdir-way-opts.mk @@ -13,7 +13,7 @@ # Set compilation flags that additionally depend on a particular way -define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way +define distdir-way-opts # args: $1 = dir, $2 = distdir, $3 = way, $4 = stage # Options for a Haskell compilation: # - CONF_HC_OPTS source-tree-wide options, selected at @@ -59,7 +59,7 @@ $1_$2_$3_ALL_HC_OPTS = \ -odir $1/$2/build -hidir $1/$2/build -stubdir $1/$2/build \ -hisuf $$($3_hisuf) -osuf $$($3_osuf) -hcsuf $$($3_hcsuf) -ifeq "$3" "0" +ifeq "$4" "0" # This is a bit of a hack. # If we are compiling something with the bootstrapping compiler on # cygwin, and it uses an include file from the rts (say), then we |