[commit: ghc] ghc-8.4: Fixup include of gmp/config.mk to use new location (57b9a43)

git at git.haskell.org git at git.haskell.org
Tue Mar 6 17:29:42 UTC 2018


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

On branch  : ghc-8.4
Link       : http://ghc.haskell.org/trac/ghc/changeset/57b9a433e13d7062eca4bd8fbae80019a499e973/ghc

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

commit 57b9a433e13d7062eca4bd8fbae80019a499e973
Author: Herbert Valerio Riedel <hvr at gnu.org>
Date:   Mon Mar 5 21:13:28 2018 +0100

    Fixup include of gmp/config.mk to use new location
    
    This wasn't spotted rightaway in
    8f0b2f5eadf0fcb47c581907205a9db686214a69
    because the include-site deliberately ignored include-errors as
    a Hack with the justification below:
    
    > Hack. The file gmp/config.mk doesn't exist yet after running ./configure in
    > the toplevel (ghc) directory. To let some toplevel make commands such as
    > sdist go through, right after ./configure, don't consider this an error.
    
    This may have contributed to #14891.
    
    (cherry picked from commit df7ac37d43bdbabbde9b09344f9425e8e5a879ff)


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

57b9a433e13d7062eca4bd8fbae80019a499e973
 libraries/integer-gmp/gmp/ghc.mk | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/libraries/integer-gmp/gmp/ghc.mk b/libraries/integer-gmp/gmp/ghc.mk
index 794942c..556a271 100644
--- a/libraries/integer-gmp/gmp/ghc.mk
+++ b/libraries/integer-gmp/gmp/ghc.mk
@@ -56,7 +56,7 @@ ifneq "$(CLEANING)" "YES"
 # Hack. The file gmp/config.mk doesn't exist yet after running ./configure in
 # the toplevel (ghc) directory. To let some toplevel make commands such as
 # sdist go through, right after ./configure, don't consider this an error.
--include libraries/integer-gmp/gmp/config.mk
+-include libraries/integer-gmp/dist-install/build/gmp/config.mk
 endif
 
 gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS))



More information about the ghc-commits mailing list