diff --git a/llvm/utils/release/test-release.sh b/llvm/utils/release/test-release.sh
--- a/llvm/utils/release/test-release.sh
+++ b/llvm/utils/release/test-release.sh
@@ -452,7 +452,8 @@
     if [ $do_test_suite = 'yes' ]; then
       cd $TestSuiteBuildDir
       env CC="$c_compiler" CXX="$cxx_compiler" \
-          cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit
+          cmake $TestSuiteSrcDir -G "$generator" -DTEST_SUITE_LIT=$Lit \
+                -DTEST_SUITE_HOST_CC=$build_compiler
 
       if ! ( ${MAKE} -j $NumJobs $KeepGoing check \
           2>&1 | tee $LogDir/llvm.check-Phase$Phase-$Flavor.log ) ; then
@@ -548,6 +549,8 @@
 
     c_compiler="$CC"
     cxx_compiler="$CXX"
+    build_compiler="$CC"
+    [[ -z "$build_compiler" ]] && build_compiler="cc"
     llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.obj
     llvmCore_phase1_destdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-$RC.install