From: Junio C Hamano <gitster@pobox.com>
Date: Mon, 18 Jun 2018 18:23:24 +0000 (-0700)
Subject: Merge branch 'es/make-no-iconv'
X-Git-Tag: v2.18.0~7
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=da34dd49bb8c9bdab5bf98f463d5b3453976db9b;p=thirdparty%2Fgit.git

Merge branch 'es/make-no-iconv'

"make NO_ICONV=NoThanks" did not override NEEDS_LIBICONV
(i.e. linkage of -lintl, -liconv, etc. that are platform-specific
tweaks), which has been corrected.

* es/make-no-iconv:
  Makefile: make NO_ICONV really mean "no iconv"
---

da34dd49bb8c9bdab5bf98f463d5b3453976db9b