Ticket #65194: compiler.diff

platform/osx/detect.py

@@ -24 +24 @@
     return [
         ("osxcross_sdk", "OSXCross SDK version", "darwin14"),
         ("MACOS_SDK_PATH", "Path to the macOS SDK", ""),
-        EnumVariable("macports_clang", "Build using Clang from MacPorts", "no", ("no", "5.0", "devel")),
+        ("macports_clang", "Build using Clang from MacPorts", "no"),
         BoolVariable("debug_symbols", "Add debugging symbols to release/release_debug builds", True),
         BoolVariable("separate_debug_symbols", "Create a separate file containing debugging symbols", False),
         BoolVariable("use_ubsan", "Use LLVM/GCC compiler undefined behavior sanitizer (UBSAN)", False),
@@ -97 +97 @@
             env["AS"] = mpprefix + "/libexec/llvm-" + mpclangver + "/bin/llvm-as"
             env.Append(CPPDEFINES=["__MACPORTS__"])  # hack to fix libvpx MM256_BROADCASTSI128_SI256 define
         else:
-            env["CC"] = "clang"
-            env["CXX"] = "clang++"
+            env["CC"] = "/usr/bin/clang"
+            env["CXX"] = "/usr/bin/clang++"
 
         detect_darwin_sdk_path("osx", env)
         env.Append(CCFLAGS=["-isysroot", "$MACOS_SDK_PATH"])