[llvm-commits] [llvm] r142607 - /llvm/trunk/utils/release/test-release.sh

[Duncan Sands]

Author: baldrick
Date: Thu Oct 20 15:10:58 2011
New Revision: 142607

URL: http://llvm.org/viewvc/llvm-project?rev=142607&view=rev
Log:
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!

Modified:
    llvm/trunk/utils/release/test-release.sh

Modified: llvm/trunk/utils/release/test-release.sh
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/utils/release/test-release.sh?rev=142607&r1=142606&r2=142607&view=diff
==============================================================================
--- llvm/trunk/utils/release/test-release.sh (original)
+++ llvm/trunk/utils/release/test-release.sh Thu Oct 20 15:10:58 2011
@@ -151,8 +151,6 @@
 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 @@
     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