diff options
| author |  Junio C Hamano <gitster@pobox.com> | 2020-11-21 15:14:38 -0800 |
|---|---|---|
| committer | Junio C Hamano <gitster@pobox.com> | 2020-11-21 15:14:39 -0800 |
| commit | c7942b91dc1575f2dd5710cfdef1355be993f657 (patch) | |
| tree | f660464a1420d5d1e859a81f9241e73cacc52378 | |
| parent | Merge branch 'en/strmap' (diff) | |
| parent | config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag (diff) | |
| download | tgif-c7942b91dc1575f2dd5710cfdef1355be993f657.tar.xz | |
Merge branch 'ab/config-mak-uname-simplify'
Build configuration cleanup.
* ab/config-mak-uname-simplify:
config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag
config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag
| -rw-r--r-- | config.mak.uname | 8 |
1 files changed, 0 insertions, 8 deletions
diff --git a/config.mak.uname b/config.mak.uname index c7eba69e54..5b30a9154a 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -541,11 +541,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL) # removing the directory at OS releases J06.21 and L17.02. # Default to the older rm until those two releases are deprecated. RM = /bin/rm -f - # As detected by './configure'. - # Missdetected, hence commented out, see below. - #NO_CURL = YesPlease - # Added manually, see above. - NEEDS_SSL_WITH_CURL = YesPlease NEEDS_CRYPTO_WITH_SSL = YesPlease HAVE_DEV_TTY = YesPlease HAVE_LIBCHARSET_H = YesPlease @@ -636,7 +631,6 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT)) prefix = INSTALL = /bin/install EXTLIBS += /mingw/lib/libz.a - NO_R_TO_GCC_LINKER = YesPlease INTERNAL_QSORT = YesPlease HAVE_LIBCHARSET_H = YesPlease NO_GETTEXT = YesPlease @@ -669,7 +663,6 @@ else -fstack-protector-strong EXTLIBS += -lntdll INSTALL = /bin/install - NO_R_TO_GCC_LINKER = YesPlease INTERNAL_QSORT = YesPlease HAVE_LIBCHARSET_H = YesPlease NO_GETTEXT = @@ -695,7 +688,6 @@ ifeq ($(uname_S),QNX) NO_MKDTEMP = YesPlease NO_NSEC = YesPlease NO_PTHREADS = YesPlease - NO_R_TO_GCC_LINKER = YesPlease NO_STRCASESTR = YesPlease NO_STRLCPY = YesPlease endif |