diff options
| author | Moritz Angermann <moritz.angermann@gmail.com> | 2018-03-03 16:16:41 -0500 |
|---|---|---|
| committer | Ben Gamari <ben@smart-cactus.org> | 2018-03-03 21:50:31 -0500 |
| commit | 8f0b2f5eadf0fcb47c581907205a9db686214a69 (patch) | |
| tree | 63e503e73e17c1ac7d9439be27392bbad05652c6 /libraries | |
| parent | 4631ceb261cb08756b955c6b495d5e719d35ab62 (diff) | |
| download | haskell-8f0b2f5eadf0fcb47c581907205a9db686214a69.tar.gz | |
Bump Cabal submodule to 2.2
Requires some ghc-cabal changes as well.
Test Plan: ./validate
Reviewers: hvr, bgamari
Reviewed By: bgamari
Subscribers: hsyl20, erikd, alpmestan, rwbarton, thomie, carter
Differential Revision: https://phabricator.haskell.org/D4453
Diffstat (limited to 'libraries')
| m--------- | libraries/Cabal | 0 | ||||
| -rw-r--r-- | libraries/base/configure.ac | 4 |
2 files changed, 2 insertions, 2 deletions
diff --git a/libraries/Cabal b/libraries/Cabal -Subproject 578d3a50db818223017b8891df268d4200b8ffd +Subproject 98a72c9da6f56a9917b66d7532df755719ec7a2 diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac index f472319a7e..a141a25a90 100644 --- a/libraries/base/configure.ac +++ b/libraries/base/configure.ac @@ -234,10 +234,10 @@ AS_IF([test "x$with_libcharset" != xno], fi # Hack - md5.h needs HsFFI.h. Is there a better way to do this? -CFLAGS="-I../../includes $CFLAGS" +CFLAGS="-I../.. -I../../../../includes $CFLAGS" dnl Calling AC_CHECK_TYPE(T) makes AC_CHECK_SIZEOF(T) abort on failure dnl instead of considering sizeof(T) as 0. -AC_CHECK_TYPE([struct MD5Context], [], [], [#include "include/md5.h"]) +AC_CHECK_TYPE([struct MD5Context], [], [AC_MSG_ERROR([internal error])], [#include "include/md5.h"]) AC_CHECK_SIZEOF([struct MD5Context], [], [#include "include/md5.h"]) AC_SUBST(EXTRA_LIBS) |