Reset the system compiler each time we start a new flavour. Otherwise
authorDuncan Sands <baldrick@free.fr>
Thu, 20 Oct 2011 20:10:58 +0000 (20:10 +0000)
committerDuncan Sands <baldrick@free.fr>
Thu, 20 Oct 2011 20:10:58 +0000 (20:10 +0000)
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!

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@142607 91177308-0d34-0410-b5e6-96231b3b80d8

utils/release/test-release.sh

index 7d56f38..eb6f9d9 100755 (executable)
@@ -151,8 +151,6 @@ LogDir=$BuildDir/logs
 mkdir -p $LogDir
 
 # Find compilers.
 mkdir -p $LogDir
 
 # Find compilers.
-c_compiler="$CC"
-cxx_compiler="$CXX"
 if [ "$do_dragonegg" = "yes" ]; then
     gcc_compiler="$GCC"
     if [ -z "$gcc_compiler" ]; then
 if [ "$do_dragonegg" = "yes" ]; then
     gcc_compiler="$GCC"
     if [ -z "$gcc_compiler" ]; then
@@ -339,6 +337,9 @@ for Flavor in $Flavors ; do
     echo "********************************************************************************"
     echo ""
 
     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
     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