[commit: ghc] master: Try to improve Make dependency for `ghc-gmp.h` (6a13099)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/6a130992b2afab5f2de87c6c8f98328eb925258c/ghc

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

commit 6a130992b2afab5f2de87c6c8f98328eb925258c
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Nov 24 12:01:37 2014 +0100

    Try to improve Make dependency for `ghc-gmp.h`
    
    This will hopefully workaround an issue where
    `libraries/integer-gmp2/include/ghc-gmp.h` gets deleted
    during cleanup but isn't regenerated.
    
    This situation is caused by `./validate` cleaning the tree with
    
      $make maintainer-clean NO_CLEAN_GMP=YES
    
    which doesn't doesn't clean the `gmp/` folder, and so the `include/ghc-gmp.h`
    file wasn't recreated (as it was previously a side-effect of building
    the intree GMP).
    
    Reviewed By: luite
    
    Differential Revision: https://phabricator.haskell.org/D523


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

6a130992b2afab5f2de87c6c8f98328eb925258c
 libraries/integer-gmp2/gmp/ghc.mk | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/libraries/integer-gmp2/gmp/ghc.mk b/libraries/integer-gmp2/gmp/ghc.mk
index 5bc3131..45991d0 100644
--- a/libraries/integer-gmp2/gmp/ghc.mk
+++ b/libraries/integer-gmp2/gmp/ghc.mk
@@ -84,7 +84,10 @@ endif
 endif
 
 ifeq "$(UseIntreeGmp)" "YES"
-$(libraries/integer-gmp2_dist-install_depfile_c_asm): libraries/integer-gmp2/gmp/gmp.h
+$(libraries/integer-gmp2_dist-install_depfile_c_asm): libraries/integer-gmp2/gmp/gmp.h libraries/integer-gmp2/include/ghc-gmp.h
+
+libraries/integer-gmp2/include/ghc-gmp.h: libraries/integer-gmp2/gmp/gmp.h
+	$(CP) $< $@
 
 gmp_CC_OPTS += -Ilibraries/integer-gmp2/gmp
 
@@ -128,7 +131,6 @@ libraries/integer-gmp2/gmp/libgmp.a libraries/integer-gmp2/gmp/gmp.h:
 	          --host=$(HOSTPLATFORM) --build=$(BUILDPLATFORM)
 	$(MAKE) -C libraries/integer-gmp2/gmp/gmpbuild MAKEFLAGS=
 	$(CP) libraries/integer-gmp2/gmp/gmpbuild/gmp.h libraries/integer-gmp2/gmp/
-	$(CP) libraries/integer-gmp2/gmp/gmpbuild/gmp.h libraries/integer-gmp2/include/ghc-gmp.h
 	$(CP) libraries/integer-gmp2/gmp/gmpbuild/.libs/libgmp.a libraries/integer-gmp2/gmp/
 	$(MKDIRHIER) libraries/integer-gmp2/gmp/objs
 	cd libraries/integer-gmp2/gmp/objs && $(AR_STAGE1) x ../libgmp.a