Commit 05b497ec authored by Ben Gamari's avatar Ben Gamari Committed by Ben Gamari

distrib: Fix libdw bindist check

As reported in #12555 this code was terribly broken. Sadly, Autoconf was
none-the-wiser. Thanks to @rwbarton for pointing this out.

Test Plan: Test with libdw version newer and older and 0.158

Reviewers: hvr, austin, rwbarton

Reviewed By: rwbarton

Subscribers: thomie, rwbarton, erikd

Differential Revision: https://phabricator.haskell.org/D2510

GHC Trac Issues: #12555
parent 34010dbe
......@@ -89,17 +89,6 @@ dnl --------------------------------------------------------------
FIND_LD([LdCmd])
AC_SUBST([LdCmd])
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
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
FP_GCC_VERSION
AC_PROG_CPP
......@@ -153,6 +142,18 @@ dnl ** how to invoke `ar' and `ranlib'
FP_PROG_AR_SUPPORTS_ATFILE
FP_PROG_AR_NEEDS_RANLIB
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
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
FP_SETTINGS
#
......
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