diff options
Diffstat (limited to 'libraries/integer-gmp')
-rw-r--r-- | libraries/integer-gmp/config.mk.in (renamed from libraries/integer-gmp/gmp/config.mk.in) | 4 | ||||
-rw-r--r-- | libraries/integer-gmp/configure.ac | 2 | ||||
-rw-r--r-- | libraries/integer-gmp/gmp/ghc.mk | 5 | ||||
-rw-r--r-- | libraries/integer-gmp/integer-gmp.cabal | 7 |
4 files changed, 12 insertions, 6 deletions
diff --git a/libraries/integer-gmp/gmp/config.mk.in b/libraries/integer-gmp/config.mk.in index 93a4f5369b..b66f94c5ad 100644 --- a/libraries/integer-gmp/gmp/config.mk.in +++ b/libraries/integer-gmp/config.mk.in @@ -1,3 +1,7 @@ +# NB: This file lives in the top-level integer-gmp folder, and not in +# the gmp subfolder, because of #14972, where we MUST NOT create a +# folder named 'gmp' in dist/build/ + ifeq "$(HaveLibGmp)" "" HaveLibGmp = @HaveLibGmp@ endif diff --git a/libraries/integer-gmp/configure.ac b/libraries/integer-gmp/configure.ac index 3aebeba5d5..1ccd48e698 100644 --- a/libraries/integer-gmp/configure.ac +++ b/libraries/integer-gmp/configure.ac @@ -106,7 +106,7 @@ AC_SUBST(GhcGmpVerMj) AC_SUBST(GhcGmpVerMi) AC_SUBST(GhcGmpVerPl) -AC_CONFIG_FILES([integer-gmp.buildinfo gmp/config.mk include/HsIntegerGmp.h]) +AC_CONFIG_FILES([integer-gmp.buildinfo config.mk include/HsIntegerGmp.h]) dnl-------------------------------------------------------------------- dnl * Generate output files diff --git a/libraries/integer-gmp/gmp/ghc.mk b/libraries/integer-gmp/gmp/ghc.mk index f18e27d1bb..2a9f3ebfc0 100644 --- a/libraries/integer-gmp/gmp/ghc.mk +++ b/libraries/integer-gmp/gmp/ghc.mk @@ -27,7 +27,6 @@ endif ifneq "$(NO_CLEAN_GMP)" "YES" $(eval $(call clean-target,gmp,,\ libraries/integer-gmp/include/ghc-gmp.h \ - libraries/integer-gmp/gmp/config.mk \ libraries/integer-gmp/gmp/libgmp.a \ libraries/integer-gmp/gmp/gmp.h \ libraries/integer-gmp/gmp/gmpbuild \ @@ -53,10 +52,10 @@ endif ifeq "$(phase)" "final" ifneq "$(CLEANING)" "YES" -# Hack. The file gmp/config.mk doesn't exist yet after running ./configure in +# Hack. The file 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/dist-install/build/gmp/config.mk +-include libraries/integer-gmp/dist-install/build/config.mk endif gmp_CC_OPTS += $(addprefix -I,$(GMP_INCLUDE_DIRS)) diff --git a/libraries/integer-gmp/integer-gmp.cabal b/libraries/integer-gmp/integer-gmp.cabal index 6edacea79c..d2f6e3cedf 100644 --- a/libraries/integer-gmp/integer-gmp.cabal +++ b/libraries/integer-gmp/integer-gmp.cabal @@ -26,16 +26,19 @@ extra-source-files: config.sub configure configure.ac - gmp/config.mk.in + config.mk.in include/HsIntegerGmp.h.in install-sh integer-gmp.buildinfo.in +-- NB: Many of these tmp files no longer ever actually get plopped in +-- the root directory post Cabal 2.4, thanks to a change that causes +-- autoconf/configure to get run inside the dist directory. extra-tmp-files: autom4te.cache config.log config.status - gmp/config.mk + config.mk integer-gmp.buildinfo include/HsIntegerGmp.h |