diff options
| author | Sergei Trofimovich <slyfox@gentoo.org> | 2014-09-08 19:11:49 +0300 |
|---|---|---|
| committer | Sergei Trofimovich <slyfox@gentoo.org> | 2014-09-08 19:17:52 +0300 |
| commit | 049bef7dc8858cff1b69002cde91b9d1cdef8e70 (patch) | |
| tree | c7f88bc3003d96251e37a199c78e962fed27f74c /rules/hs-suffix-way-rules-srcdir.mk | |
| parent | f0e725ab762fa62e20b4dac7384b0859626a266f (diff) | |
| download | haskell-049bef7dc8858cff1b69002cde91b9d1cdef8e70.tar.gz | |
rules: cleanup: use '$way_*suf' var instead of open-coded '($3_way_)s'
The changes look like:
-$1/$2/build/%.$$($3_way_)s : $1/%.c $$(LAX_DEPS_FOLLOW) $$$$($1_$2_HC_DEP)
+$1/$2/build/%.$$($3_ssuf) : $1/%.c $$(LAX_DEPS_FOLLOW) $$$$($1_$2_HC_DEP)
This way typos will manifest themselves in all ways,
not only non-vanilla.
Signed-off-by: Sergei Trofimovich <slyfox@gentoo.org>
Diffstat (limited to 'rules/hs-suffix-way-rules-srcdir.mk')
| -rw-r--r-- | rules/hs-suffix-way-rules-srcdir.mk | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/rules/hs-suffix-way-rules-srcdir.mk b/rules/hs-suffix-way-rules-srcdir.mk index 80594481ec..7b6055aad0 100644 --- a/rules/hs-suffix-way-rules-srcdir.mk +++ b/rules/hs-suffix-way-rules-srcdir.mk @@ -41,21 +41,21 @@ $1/$2/build/%.$$($3_osuf) : $1/$4/%.hc includes/ghcautoconf.h includes/ghcplatfo $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc includes/ghcautoconf.h includes/ghcplatform.h $$(call cmd,$1_$2_CC) $$($1_$2_$3_ALL_CC_OPTS) $$(addprefix -I,$$(GHC_INCLUDE_DIRS)) -x c -c $$< -o $$@ $$(if $$(findstring YES,$$($1_$2_DYNAMIC_TOO)),-dyno $$(addsuffix .$$(dyn_osuf),$$(basename $$@))) -# $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_way_)hc +# $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.$$($3_hcsuf) # $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@ # # $1/$2/build/%.$$($3_osuf) : $1/$2/build/%.hc # $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@ # -# $1/$2/build/%.$$($3_way_)s : $1/$2/build/%.$$($3_way_)hc +# $1/$2/build/%.$$($3_ssuf) : $1/$2/build/%.$$($3_hcsuf) # $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -S $$< -o $$@ # Now the rules for hs-boot files. -$1/$2/build/%.$$($3_way_)o-boot : $1/$4/%.hs-boot $$(LAX_DEPS_FOLLOW) $$$$($1_$2_HC_DEP) $$($1_$2_PKGDATA_DEP) +$1/$2/build/%.$$($3_o-boot) : $1/$4/%.hs-boot $$(LAX_DEPS_FOLLOW) $$$$($1_$2_HC_DEP) $$($1_$2_PKGDATA_DEP) $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@ $$(if $$(findstring YES,$$($1_$2_DYNAMIC_TOO)),-dyno $$(addsuffix .$$(dyn_osuf)-boot,$$(basename $$@))) -$1/$2/build/%.$$($3_way_)o-boot : $1/$4/%.lhs-boot $$(LAX_DEPS_FOLLOW) $$$$($1_$2_HC_DEP) $$($1_$2_PKGDATA_DEP) +$1/$2/build/%.$$($3_o-boot) : $1/$4/%.lhs-boot $$(LAX_DEPS_FOLLOW) $$$$($1_$2_HC_DEP) $$($1_$2_PKGDATA_DEP) $$(call cmd,$1_$2_HC) $$($1_$2_$3_ALL_HC_OPTS) -c $$< -o $$@ $$(if $$(findstring YES,$$($1_$2_DYNAMIC_TOO)),-dyno $$(addsuffix .$$(dyn_osuf)-boot,$$(basename $$@))) # stubs are automatically generated and compiled by GHC |