summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <andrew.morrow@10gen.com>2019-11-21 21:04:00 +0000
committerevergreen <evergreen@mongodb.com>2019-11-21 21:04:00 +0000
commitb3367608654d5ae827ecb0b6d7afe17b241daa7b (patch)
treecdc2472cb97bd7942521ee5d124804c957ceece6
parentfe788b0989dd6cbaa1c4ea95e01f1967bb94fdf7 (diff)
downloadmongo-b3367608654d5ae827ecb0b6d7afe17b241daa7b.tar.gz
SERVER-44687 Enforce macOS 10.12 target minimum
-rw-r--r--SConstruct10
1 files changed, 3 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct
index 321ce8595ff..1a3c9cb46fc 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2190,7 +2190,7 @@ def doConfigure(myenv):
conf.Finish()
- # We require macOS 10.10, iOS 10.2, or tvOS 10.2
+ # We require macOS 10.12 or newer
if env.TargetOSIs('darwin'):
# TODO: Better error messages, mention the various -mX-version-min-flags in the error, and
@@ -2201,12 +2201,8 @@ def doConfigure(myenv):
#include <AvailabilityMacros.h>
#include <TargetConditionals.h>
- #if TARGET_OS_OSX && (MAC_OS_X_VERSION_MIN_REQUIRED < MAC_OS_X_VERSION_10_10)
+ #if TARGET_OS_OSX && (__MAC_OS_X_VERSION_MIN_REQUIRED < __MAC_10_12)
#error 1
- #elif TARGET_OS_IOS && (__IPHONE_OS_VERSION_MIN_REQUIRED < __IPHONE_10_2)
- #error 2
- #elif TARGET_OS_TV && (__TV_OS_VERSION_MIN_REQUIRED < __TVOS_10_1)
- #error 3
#endif
"""
@@ -2220,7 +2216,7 @@ def doConfigure(myenv):
})
if not conf.CheckDarwinMinima():
- conf.env.ConfError("Required target minimum of macOS 10.10, iOS 10.2, or tvOS 10.1 not found")
+ conf.env.ConfError("Required target minimum of macOS 10.12 not found")
conf.Finish()