aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Mk/Uses/iconv.mk7
1 files changed, 3 insertions, 4 deletions
diff --git a/Mk/Uses/iconv.mk b/Mk/Uses/iconv.mk
index a8275442276b..44ee05026ecb 100644
--- a/Mk/Uses/iconv.mk
+++ b/Mk/Uses/iconv.mk
@@ -41,13 +41,12 @@ ICONV_CONFIGURE_BASE=
ICONV_INCLUDE_PATH= /usr/include
ICONV_LIB_PATH= /usr/lib/libc.so
-.if (${OPSYS} == FreeBSD && \
- (${OSVERSION} >= 1100000 && ${OSVERSION} < 1100069)) \
- || exists(${LOCALBASE}/include/iconv.h)
+.if exists(${LOCALBASE}/include/iconv.h)
+# Check that libiconv iconv.h is recent enough for LIBICONV_PLUG to work.
BUILD_DEPENDS+= libiconv>=1.14_9:converters/libiconv
-ICONV_INCLUDE_PATH= ${LOCALBASE}/include
.endif
+# LIBICONV_PLUG makes libiconv iconv.h act like libc iconv.h.
CPPFLAGS+= -DLIBICONV_PLUG
CFLAGS+= -DLIBICONV_PLUG
CXXFLAGS+= -DLIBICONV_PLUG