diff --git a/configure b/configure
index f4cac4cbe85ae..cff6f32d1466e 100755
--- a/configure
+++ b/configure
@@ -725,6 +725,7 @@ then
             if [ -z "$CC" ]
             then
                 CFG_CC="clang"
+                CFG_CXX="clang++"
             fi
             ;;
             (*)