Scons: fixed build for vanilla clang in mac os x

2 files changed, 17 insertions, 4 deletions

diff --git a/SConstruct b/SConstruct
index 08a87dbe6c..9c1644594f 100644
--- a/SConstruct
+++ b/SConstruct
@@ -353,10 +353,16 @@ if selected_platform in platform_list:
     elif methods.using_clang(env):
         # Apple LLVM versions differ from upstream LLVM version \o/, compare
         # in https://en.wikipedia.org/wiki/Xcode#Toolchain_versions
-        if (env["platform"] == "osx" or env["platform"] == "iphone") and major < 10:
-            print("Detected Apple Clang version older than 10, which does not fully "
-                  "support C++17. Supported versions are Apple Clang 10 and later.")
-            sys.exit(255)
+        if env["platform"] == "osx" or env["platform"] == "iphone":
+            vanilla = methods.is_vanilla_clang(env)
+            if vanilla and major < 6:
+                print("Detected Clang version older than 6, which does not fully support "
+                      "C++17. Supported versions are Clang 6 and later.")
+                sys.exit(255)
+            elif not vanilla and major < 10:
+                print("Detected Apple Clang version older than 10, which does not fully "
+                      "support C++17. Supported versions are Apple Clang 10 and later.")
+                sys.exit(255)
         elif major < 6:
             print("Detected Clang version older than 6, which does not fully support "
                   "C++17. Supported versions are Clang 6 and later.")
diff --git a/methods.py b/methods.py
index 18e1c0bba7..5fdcc2c4b4 100644
--- a/methods.py
+++ b/methods.py
@@ -549,6 +549,13 @@ def detect_darwin_sdk_path(platform, env):
             print("Failed to find SDK path while running xcrun --sdk {} --show-sdk-path.".format(sdk_name))
             raise
 
+def is_vanilla_clang(env):
+    if not using_clang(env):
+        return False
+    version = decode_utf8(subprocess.check_output([env['CXX'], '--version']).strip())
+    return not version.startswith("Apple")
+
+
 def get_compiler_version(env):
     if using_gcc(env):
         version = decode_utf8(subprocess.check_output([env['CXX'], '-dumpversion']).strip())