Merge branch 'ab/config-mak-uname-simplify'

[thirdparty/git.git] / config.mak.uname

diff --git a/config.mak.uname b/config.mak.uname
index c7eba69e54e669c61dd8b7333d97fb587964b68c..5b30a9154acea040bbf4aec179edf6c37737e5fc 100644 (file)
--- 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