kernel
/
git
mirror of https://git.kernel.org/pub/scm/git/git.git
1
0
Fork 0
Code Releases Activity

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"
maint
Junio C Hamano 2018-06-18 11:23:24 -07:00
parent cc2beafc4b fdb1fbbc7d
commit da34dd49bb
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
Makefile
View File

@ -1351,17 +1351,19 @@ ifdef APPLE_COMMON_CRYPTO
LIB_4_CRYPTO += -framework Security -framework CoreFoundation LIB_4_CRYPTO += -framework Security -framework CoreFoundation
endif endif
endif endif
ifdef NEEDS_LIBICONV ifndef NO_ICONV
ifdef ICONVDIR ifdef NEEDS_LIBICONV
BASIC_CFLAGS += -I$(ICONVDIR)/include ifdef ICONVDIR
ICONV_LINK = -L$(ICONVDIR)/$(lib) $(CC_LD_DYNPATH)$(ICONVDIR)/$(lib) BASIC_CFLAGS += -I$(ICONVDIR)/include
else ICONV_LINK = -L$(ICONVDIR)/$(lib) $(CC_LD_DYNPATH)$(ICONVDIR)/$(lib)
ICONV_LINK = else
ICONV_LINK =
endif
ifdef NEEDS_LIBINTL_BEFORE_LIBICONV
ICONV_LINK += -lintl
endif
EXTLIBS += $(ICONV_LINK) -liconv
endif endif
ifdef NEEDS_LIBINTL_BEFORE_LIBICONV
ICONV_LINK += -lintl
endif
EXTLIBS += $(ICONV_LINK) -liconv
endif endif
ifdef NEEDS_LIBGEN ifdef NEEDS_LIBGEN
EXTLIBS += -lgen EXTLIBS += -lgen