From 8471c7bd907b696d656801778f435d432c88f37f Mon Sep 17 00:00:00 2001 From: Sean Bruno Date: Tue, 6 Aug 2013 21:30:37 +0000 Subject: [PATCH] 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 --- tools/build/mk/OptionalObsoleteFiles.inc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools/build/mk/OptionalObsoleteFiles.inc b/tools/build/mk/OptionalObsoleteFiles.inc index 35d71e288f5f..4c337b6955cb 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