Skip to content

Commit 55b6dff

Browse files
committed
Merge branch 'jc/config-mak-document-darwin-vs-macosx'
* jc/config-mak-document-darwin-vs-macosx: config.mak.uname: add hint on uname_R for MacOS X config.mak.uname: set NO_APPLE_COMMON_CRYPTO on older systems
2 parents 08668f1 + 9eeff2f commit 55b6dff

File tree

1 file changed

+5
-0
lines changed

1 file changed

+5
-0
lines changed

config.mak.uname

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -89,8 +89,13 @@ ifeq ($(uname_S),Darwin)
8989
NEEDS_CRYPTO_WITH_SSL = YesPlease
9090
NEEDS_SSL_WITH_CRYPTO = YesPlease
9191
NEEDS_LIBICONV = YesPlease
92+
# Note: $(uname_R) gives us the underlying Darwin version.
93+
# - MacOS 10.0.* and MacOS 10.1.0 = Darwin 1.*
94+
# - MacOS 10.x.* = Darwin (x+4).* for (1 <= x)
95+
# i.e. "begins with [15678] and a dot" means "10.4.* or older".
9296
ifeq ($(shell expr "$(uname_R)" : '[15678]\.'),2)
9397
OLD_ICONV = UnfortunatelyYes
98+
NO_APPLE_COMMON_CRYPTO = YesPlease
9499
endif
95100
ifeq ($(shell expr "$(uname_R)" : '[15]\.'),2)
96101
NO_STRLCPY = YesPlease

0 commit comments

Comments
 (0)