summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Morrow <acm@mongodb.com>2018-12-20 18:25:20 -0500
committerAndrew Morrow <acm@mongodb.com>2019-01-30 21:10:29 -0500
commit9ac90b128ebeb1bb431ebe3fe9176cb6142818cb (patch)
tree2383181fd880d114b2424007ea4c445b58b44702
parenta285618a35742923e9e21fa2df4434406b121a4e (diff)
downloadmongo-9ac90b128ebeb1bb431ebe3fe9176cb6142818cb.tar.gz
SERVER-37609 Require clang 7.0, GCC 8.2, and XCode 10
-rw-r--r--SConstruct10
1 files changed, 5 insertions, 5 deletions
diff --git a/SConstruct b/SConstruct
index 9bc1129ad5f..499697acc29 100644
--- a/SConstruct
+++ b/SConstruct
@@ -1967,14 +1967,14 @@ def doConfigure(myenv):
}
""" % compiler_minimum_string)
elif myenv.ToolchainIs('gcc'):
- compiler_minimum_string = "GCC 5.3.0"
+ compiler_minimum_string = "GCC 8.2"
compiler_test_body = textwrap.dedent(
"""
#if !defined(__GNUC__) || defined(__clang__)
#error
#endif
- #if (__GNUC__ < 5) || (__GNUC__ == 5 && __GNUC_MINOR__ < 3) || (__GNUC__ == 5 && __GNUC_MINOR__ == 3 && __GNUC_PATCHLEVEL__ < 0)
+ #if (__GNUC__ < 8) || (__GNUC__ == 8 && __GNUC_MINOR__ < 2)
#error %s or newer is required to build MongoDB
#endif
@@ -1983,7 +1983,7 @@ def doConfigure(myenv):
}
""" % compiler_minimum_string)
elif myenv.ToolchainIs('clang'):
- compiler_minimum_string = "clang 3.8 (or Apple XCode 8.3.2)"
+ compiler_minimum_string = "clang 7.0 (or Apple XCode 10.0)"
compiler_test_body = textwrap.dedent(
"""
#if !defined(__clang__)
@@ -1991,10 +1991,10 @@ def doConfigure(myenv):
#endif
#if defined(__apple_build_version__)
- #if __apple_build_version__ < 8020042
+ #if __apple_build_version__ < 10001145
#error %s or newer is required to build MongoDB
#endif
- #elif (__clang_major__ < 3) || (__clang_major__ == 3 && __clang_minor__ < 8)
+ #elif (__clang_major__ < 7) || (__clang_major__ == 7 && __clang_minor__ < 0)
#error %s or newer is required to build MongoDB
#endif