diff --git a/llvm/autoconf/configure.ac b/llvm/autoconf/configure.ac
index 1da752dc68c2..e0663cdf92dd 100644
--- a/llvm/autoconf/configure.ac
+++ b/llvm/autoconf/configure.ac
@@ -838,7 +838,7 @@ AC_ARG_WITH(gcc-toolchain,
 AC_DEFINE_UNQUOTED(GCC_INSTALL_PREFIX,"$withval",
                    [Directory where gcc is installed.])
 
-AC_ARG_WITH(sysroot,
+AC_ARG_WITH(default-sysroot,
   AS_HELP_STRING([--with-default-sysroot],
     [Add --sysroot=<path> to all compiler invocations.]),,
     withval="")
diff --git a/llvm/configure b/llvm/configure
index 50db26c7c765..f72dca4dbf73 100755
--- a/llvm/configure
+++ b/llvm/configure
@@ -5584,9 +5584,9 @@ _ACEOF
 
 
 
-# Check whether --with-sysroot was given.
-if test "${with_sysroot+set}" = set; then
-  withval=$with_sysroot;
+# Check whether --with-default-sysroot was given.
+if test "${with_default_sysroot+set}" = set; then
+  withval=$with_default_sysroot;
 else
   withval=""
 fi