diff --git a/configure b/configure
index 8b92585ecc9..dd014efb30c 100755
--- a/configure
+++ b/configure
@@ -2488,8 +2488,21 @@ if [ -z "$PLATFORM" ]; then
     case "$UNAME_SYSTEM:$UNAME_RELEASE" in
      Darwin:*)
         if [ "$PLATFORM_MAC" = "yes" -o "$PLATFORM_QPA" = "yes" ]; then
-          PLATFORM=macx-g++
-        # PLATFORM=macx-xcode
+          OSX_VERSION=`uname -r | cut -d. -f1`
+          if [ "$OSX_VERSION" -ge 11 ]; then
+              # We're on Lion or above. Check if we have a supported Clang version
+              case "$(clang -v 2>&1 | grep -Po '(?<=version )\d[\d.]+')" in
+                  3.*)
+                      PLATFORM=macx-clang
+                      PLATFORM_NOTES="\n    - Also available for Mac OS X: macx-g++\n"
+                      ;;
+                  *)
+                      PLATFORM=macx-g++
+                      ;;
+              esac
+          else
+              PLATFORM=macx-g++
+          fi
         else
           PLATFORM=darwin-g++
         fi