On Fri, Jun 15, 2018 at 12:20 AM Jeff King <peff@xxxxxxxx> wrote: > We have OLD_ICONV, too, which should probably do nothing if NO_ICONV is > set. I think that works OK. We end up setting -DOLD_ICONV on the command > line, but that's only consider inside "#ifndef NO_ICONV" within the > code. Right, that was my conclusion, as well. Since it works as is, I'm not sure suppressing -DOLD_ICONV in Makefile is worth the extra patch noise. I can re-roll with that change too, if someone thinks it's worthwhile, though.