diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2019-07-07 09:54:57 -0400 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2019-07-07 09:58:39 -0400 |
| commit | e4fd8acb8a08ba5d0948672619a60af2f2bbe9a3 (patch) | |
| tree | 2a8b54f3ed40cfd8e562b747d0dec2e70e959151 | |
| parent | 2fd1ed541ae55a30ef65e18dc09bba993f37c70e (diff) | |
| download | haskell-wip/T16922.tar.gz | |
Don't package settings in bindistwip/T16922
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`.
| -rw-r--r-- | distrib/configure.ac.in | 5 | ||||
| -rw-r--r-- | 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 @@ -1022,7 +1022,6 @@ $(eval $(call bindist-list,.,\ $(BINDIST_HI) \ $(BINDIST_EXTRAS) \ includes/Makefile \ - $(includes_SETTINGS) \ $(includes_H_FILES) \ $(includes_DERIVEDCONSTANTS) \ $(includes_GHCCONSTANTS) \ |