summaryrefslogtreecommitdiff
path: root/SConstruct
diff options
context:
space:
mode:
authorAndrew Morrow <andrew.morrow@10gen.com>2019-12-11 16:07:43 +0000
committerevergreen <evergreen@mongodb.com>2019-12-11 16:07:43 +0000
commite4e0b767de22847f2c6627f670ee749a703a3ef8 (patch)
treeeee6547a00f71d6e8b8aebd45e3bf929d7c235b2 /SConstruct
parent825f7246e8a973f134c533d0d1f3b68abeeba010 (diff)
downloadmongo-e4e0b767de22847f2c6627f670ee749a703a3ef8.tar.gz
SERVER-44687 Enforce macOS 10.11 target minimum
(cherry picked from commit b3367608654d5ae827ecb0b6d7afe17b241daa7b) (cherry picked from commit ed399a2efa01185d38d57b0bda11e70ff7ca6dc8)
Diffstat (limited to 'SConstruct')
-rw-r--r--SConstruct10
1 files changed, 3 insertions, 7 deletions
diff --git a/SConstruct b/SConstruct
index b0bb2ce6be6..2906add0128 100644
--- a/SConstruct
+++ b/SConstruct
@@ -2002,7 +2002,7 @@ def doConfigure(myenv):
conf.Finish()
- # We require macOS 10.10, iOS 10.2, or tvOS 10.2
+ # We require macOS 10.11 or newer
if env.TargetOSIs('darwin'):
# TODO: Better error messages, mention the various -mX-version-min-flags in the error, and
@@ -2013,12 +2013,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_11)
#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
"""
@@ -2032,7 +2028,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.11 not found")
conf.Finish()