From a9c6123b648cca8d9367428234cc6d7174e972af Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 11 Nov 2020 10:54:19 +0100 Subject: [PATCH 1/2] config.mak.uname: remove unused the NO_R_TO_GCC_LINKER flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The NO_R_TO_GCC_LINKER flag was still being on some platforms. It hasn't been used since my 0f50c8e32c8 ("Makefile: remove the NO_R_TO_GCC_LINKER flag", 2019-05-17). Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- config.mak.uname | 3 --- 1 file changed, 3 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index c7eba69e54..8d7b96f8b9 100644 --- a/config.mak.uname +++ b/config.mak.uname @@ -636,7 +636,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 +668,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 +693,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 From b990f02fd860e75629f9d6771cd3ccc48aba2c00 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=C3=86var=20Arnfj=C3=B6r=C3=B0=20Bjarmason?= Date: Wed, 11 Nov 2020 10:54:20 +0100 Subject: [PATCH 2/2] config.mak.uname: remove unused NEEDS_SSL_WITH_CURL flag MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit The NEEDS_SSL_WITH_CURL flag was still being set in one case, but hasn't existed since 23c4bbe28e6 ("build: link with curl-defined linker flags", 2018-11-03). Remove it, and a comment which referred to it. See 6c109904bc8 ("Port to HP NonStop", 2012-09-19) for the initial addition of the comment. Signed-off-by: Ævar Arnfjörð Bjarmason Signed-off-by: Junio C Hamano --- config.mak.uname | 5 ----- 1 file changed, 5 deletions(-) diff --git a/config.mak.uname b/config.mak.uname index 8d7b96f8b9..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