diff options
| author | James Knight <james.d.knight@live.com> | 2018-11-03 05:12:11 (GMT) |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2018-11-05 01:19:25 (GMT) |
| commit | 23c4bbe28e61974577164db09cbd1d1c7e568ca4 (patch) | |
| tree | 9669d56595c17501d83735e1b9043c88b12e7053 /config.mak.uname | |
| parent | d582ea202b626dcc6c3b01e1e11a296d9badd730 (diff) | |
| download | git-23c4bbe28e61974577164db09cbd1d1c7e568ca4.zip git-23c4bbe28e61974577164db09cbd1d1c7e568ca4.tar.gz git-23c4bbe28e61974577164db09cbd1d1c7e568ca4.tar.bz2 | |
build: link with curl-defined linker flags
Adjusting the build process to rely more on curl-config to populate
linker flags instead of manually populating flags based off detected
features.
Originally, a configure-invoked build would check for SSL-support in the
target curl library. If enabled, NEEDS_SSL_WITH_CURL would be set and
used in the Makefile to append additional libraries to link against. As
for systems building solely with make, the defines NEEDS_IDN_WITH_CURL
and NEEDS_SSL_WITH_CURL could be set to indirectly enable respective
linker flags. Since both configure.ac and Makefile already rely on
curl-config utility to provide curl-related build information, adjusting
the respective assets to populate required linker flags using the
utility (unless explicitly configured).
Signed-off-by: James Knight <james.d.knight@live.com>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
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 8acdeb7..19e6633 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -431,8 +431,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 @@ -458,7 +456,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 |