X-Git-Url: http://git.megacz.com/?a=blobdiff_plain;f=rules%2Fbuild-prog.mk;h=e07290772b7b1fc99a6f53a097619dc3bc91704b;hb=79324024325fd2e966427faef770ac96c3c60c70;hp=ebc899052f2001a7ba46fbe6cad98508c838f020;hpb=85f096f8051d4a5c20ac36c1b8866007ad4146c3;p=ghc-hetmet.git diff --git a/rules/build-prog.mk b/rules/build-prog.mk index ebc8990..e072907 100644 --- a/rules/build-prog.mk +++ b/rules/build-prog.mk @@ -49,14 +49,14 @@ define build-prog-helper $(call all-target,$1,all_$1_$2) -$(call package-config,$1,$2,$3) - ifeq "$$($1_USES_CABAL)" "YES" ifneq "$$(NO_INCLUDE_PKGDATA)" "YES" include $1/$2/package-data.mk endif endif +$(call package-config,$1,$2,$3) + ifeq "$$($1_USES_CABAL)$$($1_$2_VERSION)" "YES" $1_$2_DISABLE = YES endif @@ -92,7 +92,7 @@ $(call c-sources,$1,$2) $1_$2_depfile_base = $1/$2/build/.depend -$(call build-dependencies,$1,$2) +$(call build-dependencies,$1,$2,$3) # --- IMPLICIT RULES