summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Steuck <greg@nest.cx>2021-06-06 22:30:52 -0700
committerBen Gamari <ben@smart-cactus.org>2021-09-02 14:20:46 -0400
commitdc5141d7341d74023d23ef74ac7e4e4841efa93d (patch)
tree647f7ff57e7e16d42fb4cf11f9c34e95dd486328
parent8c8bea56bf99e9fa22a24332630d88814e7d6054 (diff)
downloadhaskell-dc5141d7341d74023d23ef74ac7e4e4841efa93d.tar.gz
Fix iconv detection in configure on OpenBSD
This regressed in 544414ba604b13e0992ad87e90b8bdf45c43011c causing configure: error: iconv is required on non-Windows platforms More details: https://gitlab.haskell.org/ghc/ghc/-/commit/544414ba604b13e0992ad87e90b8bdf45c43011c#3bae3b74ae866493bd6b79df16cb638a5f2e0f87_106_106 (cherry picked from commit 31dc013fdec0cf2ddac1ba093c8a6933a0b62df2)
-rw-r--r--libraries/base/configure.ac2
1 files changed, 1 insertions, 1 deletions
diff --git a/libraries/base/configure.ac b/libraries/base/configure.ac
index f0b4f371c4..68295563af 100644
--- a/libraries/base/configure.ac
+++ b/libraries/base/configure.ac
@@ -103,7 +103,7 @@ dnl--------------------------------------------------------------------
AC_ARG_WITH([iconv-includes],
[AS_HELP_STRING([--with-iconv-includes],
[directory containing iconv.h])],
- [ICONV_INCLUDE_DIRS=$withval],
+ [ICONV_INCLUDE_DIRS=$withval; CPPFLAGS="-I$withval $CPPFLAGS"],
[ICONV_INCLUDE_DIRS=])
AC_ARG_WITH([iconv-libraries],