From c52861c44e44c05ce21476b134a87a093faa880c Mon Sep 17 00:00:00 2001 From: Duncan Sands Date: Thu, 20 Oct 2011 20:10:58 +0000 Subject: [PATCH] Reset the system compiler each time we start a new flavour. Otherwise the last compiler built for the previous flavour is used for the next, for example the Debug clang compiler was being used for the initial build of the Release LLVM. Flavors should be independent of each other. This especially matters if the compiler built for the previous flavour doesn't actually work! llvm-svn: 142607 --- utils/release/test-release.sh | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh index 7d56f3872c7..eb6f9d96f4f 100755 --- a/utils/release/test-release.sh +++ b/utils/release/test-release.sh @@ -151,8 +151,6 @@ LogDir=$BuildDir/logs mkdir -p $LogDir # Find compilers. -c_compiler="$CC" -cxx_compiler="$CXX" if [ "$do_dragonegg" = "yes" ]; then gcc_compiler="$GCC" if [ -z "$gcc_compiler" ]; then @@ -339,6 +337,9 @@ for Flavor in $Flavors ; do echo "********************************************************************************" echo "" + c_compiler="$CC" + cxx_compiler="$CXX" + llvmCore_phase1_objdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-rc$RC.obj llvmCore_phase1_installdir=$BuildDir/Phase1/$Flavor/llvmCore-$Release-rc$RC.install dragonegg_phase1_objdir=$BuildDir/Phase1/$Flavor/DragonEgg-$Release-rc$RC.obj