diff options
| author | Andrew Morrow <andrew.morrow@10gen.com> | 2019-12-02 22:29:44 +0000 |
|---|---|---|
| committer | evergreen <evergreen@mongodb.com> | 2019-12-02 22:29:44 +0000 |
| commit | ed399a2efa01185d38d57b0bda11e70ff7ca6dc8 (patch) | |
| tree | 8d637a0321cccbe0a416389a10d7905a34d838c0 | |
| parent | 954c3efe549a9a88aa408ce8b15e37ea43179c8e (diff) | |
| download | mongo-ed399a2efa01185d38d57b0bda11e70ff7ca6dc8.tar.gz | |
SERVER-44687 Enforce macOS 10.12 target minimum
(cherry picked from commit b3367608654d5ae827ecb0b6d7afe17b241daa7b)
| -rw-r--r-- | SConstruct | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct index 377365f0ffc..ba3403f9066 100644 --- a/SConstruct +++ b/SConstruct @@ -2102,7 +2102,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 @@ -2113,12 +2113,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 """ @@ -2132,7 +2128,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() |