diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index bdfb76dd14d..093d9f1f47d 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -354,8 +354,8 @@ esac
 AC_SUBST(ETAGSFLAGS,$ETAGSFLAGS)
 
 if test "$WITH_LLVMGCCDIR" = "default" ; then
-  AC_PATH_PROG(LLVMGCC, [llvm-gcc], [llvm-gcc])
-  AC_PATH_PROG(LLVMGXX, [llvm-g++], [llvm-g++])
+  AC_PATH_PROG(LLVMGCC, [llvm-gcc], [])
+  AC_PATH_PROG(LLVMGXX, [llvm-g++], [])
 else
   LLVMGCC=$WITH_LLVMGCCDIR/bin/llvm-gcc
   LLVMGXX=$WITH_LLVMGCCDIR/bin/llvm-g++
diff --git a/configure b/configure
index bbe4105cb5f..948517019d2 100755
--- a/configure
+++ b/configure
@@ -24648,7 +24648,6 @@ do
 done
 done
 
-  test -z "$ac_cv_path_LLVMGCC" && ac_cv_path_LLVMGCC="llvm-gcc"
   ;;
 esac
 fi
@@ -24688,7 +24687,6 @@ do
 done
 done
 
-  test -z "$ac_cv_path_LLVMGXX" && ac_cv_path_LLVMGXX="llvm-g++"
   ;;
 esac
 fi