diff options
author | Junio C Hamano <gitster@pobox.com> | 2018-11-18 12:23:53 +0300 |
---|---|---|
committer | Junio C Hamano <gitster@pobox.com> | 2018-11-18 12:23:53 +0300 |
commit | fa2f2f085ed8999b799d48e652f9e438571e8491 (patch) | |
tree | 5a2e3f178a670fa9bb0f76affb0db2b05c9131fb /config.mak.uname | |
parent | 95a3ef5e2efb96c9b4eeface527d73c08a406cd3 (diff) | |
parent | 23c4bbe28e61974577164db09cbd1d1c7e568ca4 (diff) |
Merge branch 'jk/curl-ldflags'
The way -lcurl library gets linked has been simplified by taking
advantage of the fact that we can just ask curl-config command how.
* jk/curl-ldflags:
build: link with curl-defined linker flags
Diffstat (limited to 'config.mak.uname')
-rw-r--r-- | config.mak.uname | 3 |
1 files changed, 0 insertions, 3 deletions
diff --git a/config.mak.uname b/config.mak.uname index f179d7a1dc..3ee7da0e23 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -430,8 +430,6 @@ ifeq ($(uname_S),Minix) NO_NSEC = YesPlease NEEDS_LIBGEN = NEEDS_CRYPTO_WITH_SSL = YesPlease - NEEDS_IDN_WITH_CURL = YesPlease - NEEDS_SSL_WITH_CURL = YesPlease NEEDS_RESOLV = NO_HSTRERROR = YesPlease NO_MMAP = YesPlease @@ -457,7 +455,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL) # Missdetected, hence commented out, see below. #NO_CURL = YesPlease # Added manually, see above. - NEEDS_SSL_WITH_CURL = YesPlease HAVE_LIBCHARSET_H = YesPlease HAVE_STRINGS_H = YesPlease NEEDS_LIBICONV = YesPlease |