Commit f508b7ce authored by Ben Gamari's avatar Ben Gamari 🐢 Committed by Marge Bot

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`.
parent f9b00038
......@@ -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
......
......@@ -1022,7 +1022,6 @@ $(eval $(call bindist-list,.,\
$(BINDIST_HI) \
$(BINDIST_EXTRAS) \
includes/Makefile \
$(includes_SETTINGS) \
$(includes_H_FILES) \
$(includes_DERIVEDCONSTANTS) \
$(includes_GHCCONSTANTS) \
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment