From e4fd8acb8a08ba5d0948672619a60af2f2bbe9a3 Mon Sep 17 00:00:00 2001
From: Ben Gamari <ben@smart-cactus.org>
Date: Sun, 7 Jul 2019 09:54:57 -0400
Subject: Don't package settings in bindist

Since !712 the `settings` file is produced by the build system instead
of autoconf. However, this introduced a subtle bug where we would fail
to rebuild the `settings` file with what we have learned from the
install-time `configure` invocation. Fix this by not packaging
`settings` in the bindist tarball. The build system will take care of
the rest.

Also fix a bug where the value of `UseLibdw` was not being persisted to
the install time `configure`.
---
 distrib/configure.ac.in | 5 +++--
 ghc.mk                  | 1 -
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in
index bdd9815e59..f8fa83ef44 100644
--- a/distrib/configure.ac.in
+++ b/distrib/configure.ac.in
@@ -186,13 +186,14 @@ dnl ** Have libdw?
 dnl --------------------------------------------------------------
 dnl Check for a usable version of libdw/elfutils
 dnl Currently we need 0.158 or newer.
-BinDistNeedsLibdw=@UseLibdw@
-if test "x$BinDistNeedsLibdw" = "xYES" ; then
+UseLibdw=@UseLibdw@
+if test "x$UseLibdw" = "xYES" ; then
   AC_CHECK_LIB(dw, dwfl_attach_state,
     [UseLibdw=YES],
     [AC_MSG_ERROR([Binary distribution was built with libdw support but target system doesn't have supported libdw version (needs at least 0.158)])]
   )
 fi
+AC_SUBST(UseLibdw)
 
 FP_SETTINGS
 
diff --git a/ghc.mk b/ghc.mk
index 21cb0a2397..6db08c965f 100644
--- a/ghc.mk
+++ b/ghc.mk
@@ -1022,7 +1022,6 @@ $(eval $(call bindist-list,.,\
     $(BINDIST_HI) \
     $(BINDIST_EXTRAS) \
     includes/Makefile \
-    $(includes_SETTINGS) \
     $(includes_H_FILES) \
     $(includes_DERIVEDCONSTANTS) \
     $(includes_GHCCONSTANTS) \
-- 
cgit v1.2.1