[commit: integer-gmp] master: Handle dependencies for .cmm files properly (8c0c77b)

Ian Lynagh igloo at earth.li
Thu May 9 22:06:37 CEST 2013


Repository : ssh://darcs.haskell.org//srv/darcs/packages/integer-gmp

On branch  : master

http://hackage.haskell.org/trac/ghc/changeset/8c0c77bd47a311cb36809b06d811469182e10899

>---------------------------------------------------------------

commit 8c0c77bd47a311cb36809b06d811469182e10899
Author: Ian Lynagh <ian at well-typed.com>
Date:   Thu May 9 20:47:02 2013 +0100

    Handle dependencies for .cmm files properly

>---------------------------------------------------------------

 gmp/ghc.mk |    8 ++------
 1 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/gmp/ghc.mk b/gmp/ghc.mk
index 54b6d08..b540910 100644
--- a/gmp/ghc.mk
+++ b/gmp/ghc.mk
@@ -49,6 +49,7 @@ ifeq "$(findstring clean,$(MAKECMDGOALS))" ""
 include libraries/integer-gmp/gmp/config.mk
 endif
 
+libraries/integer-gmp_dist-install_EXTRA_CC_OPTS += -Ilibraries/integer-gmp/mkGmpDerivedConstants/dist
 libraries/integer-gmp_dist-install_EXTRA_HC_OPTS += -Ilibraries/integer-gmp/mkGmpDerivedConstants/dist
 
 gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS))
@@ -77,12 +78,7 @@ HaveFrameworkGMP = NO
 endif
 endif
 
-define GmpDerivedConstants-dependencies # args: $1 = way
-$$(libraries/integer-gmp_dist-install_$1_CMM_OBJS): $$$$(GmpDerivedConstants_HEADER)
-$$(libraries/integer-gmp_dist-install_$1_C_OBJS):   $$$$(GmpDerivedConstants_HEADER)
-endef
-
-$(foreach w,$(GhcLibWays),$(eval $(call GmpDerivedConstants-dependencies,$w)))
+$(libraries/integer-gmp_dist-install_depfile_c_asm): $$(GmpDerivedConstants_HEADER)
 
 ifneq "$(HaveLibGmp)" "YES"
 ifneq "$(HaveFrameworkGMP)" "YES"





More information about the ghc-commits mailing list