summaryrefslogtreecommitdiffstats
path: root/tools/build
diff options
context:
space:
mode:
authorsbruno <sbruno@FreeBSD.org>2013-08-06 21:30:37 +0000
committersbruno <sbruno@FreeBSD.org>2013-08-06 21:30:37 +0000
commit6ecfed30881b9d03ad4eee62840ed9fae3b92a26 (patch)
tree6dfe709fc9c491b555881c0ddd77ff397793bb4c /tools/build
parentb2d5c6bc2aa8c4728acf4f5741f51c3dcc96a3b0 (diff)
downloadFreeBSD-src-6ecfed30881b9d03ad4eee62840ed9fae3b92a26.zip
FreeBSD-src-6ecfed30881b9d03ad4eee62840ed9fae3b92a26.tar.gz
Adjust make knobs to know that WITH_ICONV installs a /usr/bin/iconv
Remove it if the knob isn't tweaked. Certain ports seem to think that if /usr/bin/iconv exists, then libc has built in libiconv things and will blow up pretty nicely when built. Reviewed by: gjb@ MFC after: 2 weeks
Diffstat (limited to 'tools/build')
-rw-r--r--tools/build/mk/OptionalObsoleteFiles.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc
index 35d71e2..4c337b6 100644
--- a/tools/build/mk/OptionalObsoleteFiles.inc
+++ b/tools/build/mk/OptionalObsoleteFiles.inc
@@ -4347,3 +4347,7 @@ OLD_FILES+=usr/bin/svnserve
OLD_FILES+=usr/bin/svnsync
OLD_FILES+=usr/bin/svnversion
.endif
+
+.if ${MK_ICONV} == no
+OLD_FILES+=usr/bin/iconv
+.endif
OpenPOWER on IntegriCloud