diff options
| author | Ben Gamari <bgamari.foss@gmail.com> | 2016-09-04 13:23:35 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2016-09-05 16:59:49 -0400 |
| commit | 05b497ece50f508526d0906f675bdb4c8109d46a (patch) | |
| tree | 10b77b7d3785a7adec384df70cd6df87f59dae0a /distrib | |
| parent | 34010dbe77ac405da6c671c3feb3573d0d025379 (diff) | |
| download | haskell-05b497ece50f508526d0906f675bdb4c8109d46a.tar.gz | |
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
Diffstat (limited to 'distrib')
| -rw-r--r-- | distrib/configure.ac.in | 23 |
1 files changed, 12 insertions, 11 deletions
diff --git a/distrib/configure.ac.in b/distrib/configure.ac.in index 19ea5f044b..0ae716b112 100644 --- a/distrib/configure.ac.in +++ b/distrib/configure.ac.in @@ -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 # |