diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 09d31c9d4bf..cd427702f17 100644
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -153,10 +153,10 @@ case $llvm_cv_platform_type in
     ;;
 esac
 
-dnl Make a link from lib/System/platform to lib/System/$llvm_cv_platform_type
+dnl Make a link from lib/System/platform to lib/System/$llvm_cv_os_type
 dnl This helps the #inclusion of the system specific include files
 dnl for the operating system abstraction library, lib/System.
-AC_CONFIG_LINKS(lib/System/platform:lib/System/$llvm_cv_platform_type)
+AC_CONFIG_LINKS(lib/System/platform:lib/System/$llvm_cv_os_type)
 
 dnl If we are targetting a Sparc machine running Solaris, pretend that it is
 dnl V9, since that is all that we support at the moment, and autoconf will only
diff --git a/configure b/configure
index 94e5706b1a6..4c726e2f20e 100755
--- a/configure
+++ b/configure
@@ -1764,7 +1764,7 @@ _ACEOF
     ;;
 esac
 
-          ac_config_links="$ac_config_links lib/System/platform:lib/System/$llvm_cv_platform_type"
+          ac_config_links="$ac_config_links lib/System/platform:lib/System/$llvm_cv_os_type"
 
 
 case $target in
@@ -30321,7 +30321,7 @@ do
   "tools/llvmc/ll" ) CONFIG_FILES="$CONFIG_FILES tools/llvmc/ll" ;;
   "tools/llvmc/c" ) CONFIG_FILES="$CONFIG_FILES tools/llvmc/c" ;;
   "docs/doxygen.cfg" ) CONFIG_FILES="$CONFIG_FILES docs/doxygen.cfg" ;;
-  "lib/System/platform" ) CONFIG_LINKS="$CONFIG_LINKS lib/System/platform:lib/System/$llvm_cv_platform_type" ;;
+  "lib/System/platform" ) CONFIG_LINKS="$CONFIG_LINKS lib/System/platform:lib/System/$llvm_cv_os_type" ;;
   "Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile" ;;
   "Makefile.common" ) CONFIG_COMMANDS="$CONFIG_COMMANDS Makefile.common" ;;
   "examples/Makefile" ) CONFIG_COMMANDS="$CONFIG_COMMANDS examples/Makefile" ;;