Skip to content

Commit c7942b9

Browse files
committed
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
2 parents bf0a430 + b990f02 commit c7942b9

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

config.mak.uname

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -541,11 +541,6 @@ ifeq ($(uname_S),NONSTOP_KERNEL)
541541
# removing the directory at OS releases J06.21 and L17.02.
542542
# Default to the older rm until those two releases are deprecated.
543543
RM = /bin/rm -f
544-
# As detected by './configure'.
545-
# Missdetected, hence commented out, see below.
546-
#NO_CURL = YesPlease
547-
# Added manually, see above.
548-
NEEDS_SSL_WITH_CURL = YesPlease
549544
NEEDS_CRYPTO_WITH_SSL = YesPlease
550545
HAVE_DEV_TTY = YesPlease
551546
HAVE_LIBCHARSET_H = YesPlease
@@ -636,7 +631,6 @@ ifneq (,$(wildcard ../THIS_IS_MSYSGIT))
636631
prefix =
637632
INSTALL = /bin/install
638633
EXTLIBS += /mingw/lib/libz.a
639-
NO_R_TO_GCC_LINKER = YesPlease
640634
INTERNAL_QSORT = YesPlease
641635
HAVE_LIBCHARSET_H = YesPlease
642636
NO_GETTEXT = YesPlease
@@ -669,7 +663,6 @@ else
669663
-fstack-protector-strong
670664
EXTLIBS += -lntdll
671665
INSTALL = /bin/install
672-
NO_R_TO_GCC_LINKER = YesPlease
673666
INTERNAL_QSORT = YesPlease
674667
HAVE_LIBCHARSET_H = YesPlease
675668
NO_GETTEXT =
@@ -695,7 +688,6 @@ ifeq ($(uname_S),QNX)
695688
NO_MKDTEMP = YesPlease
696689
NO_NSEC = YesPlease
697690
NO_PTHREADS = YesPlease
698-
NO_R_TO_GCC_LINKER = YesPlease
699691
NO_STRCASESTR = YesPlease
700692
NO_STRLCPY = YesPlease
701693
endif

0 commit comments

Comments
 (0)