Minor cleanup related to my latest scheduler changes.

[oota-llvm.git] / utils / release / test-release.sh

diff --git a/utils/release/test-release.sh b/utils/release/test-release.sh
old mode 100644 (file)
new mode 100755 (executable)
index 89232a3..e24638e
--- a/utils/release/test-release.sh
+++ b/utils/release/test-release.sh
@@ -19,6 +19,7 @@ Release_no_dot=""
 RC=""
 do_checkout="yes"
 do_ada="no"
+do_objc="yes"
 do_fortran="yes"
 do_64bit="yes"
 BuildDir="`pwd`"
@@ -33,6 +34,7 @@ function usage() {
     echo " -no-checkout      Don't checkout the sources from SVN."
     echo " -no-64bit         Don't test the 64-bit version. [default: yes]"
     echo " -ada              Build Ada. [default: no]"
+    echo " -disable-objc     Disable ObjC build. [default: build]"
     echo " -disable-fortran  Disable Fortran build. [default: build]"
 }
 
@@ -67,6 +69,9 @@ while [ $# -gt 0 ]; do
         -ada | --ada )
             do_ada="yes"
             ;;
+        -disable-objc | --disable-objc )
+            do_objc="no"
+            ;;
         -disable-fortran | --disable-fortran )
             echo "WARNING: Do you *really* need to disable Fortran?"
             sleep 5
@@ -170,11 +175,11 @@ function configure_llvmCore() {
     case $Flavor in
         Release | Release-64 )
             Optimized="yes"
-            Assertions="yes"
+            Assertions="no"
             ;;
-        Release-Asserts )
+        Release+Asserts )
             Optimized="yes"
-            Assertions="no"
+            Assertions="yes"
             ;;
         Debug )
             Optimized="no"
@@ -189,7 +194,7 @@ function configure_llvmCore() {
 
     cd $ObjDir
     echo "# Configuring llvm $Release-rc$RC $Flavor"
-    echo "# $llvmCore_srcdir/configure --prefix=$llvmCore_installdir \
+    echo "# $llvmCore_srcdir/configure --prefix=$InstallDir \
         --enable-optimized=$Optimized \
         --enable-assertions=$Assertions \
         --with-llvmgccdir=$llvmgccDir"
@@ -250,7 +255,10 @@ function configure_llvm_gcc() {
     InstallDir="$4"
     llvmObjDir="$5"
 
-    languages="c,c++,objc,obj-c++"
+    languages="c,c++"
+    if [ "$do_objc" = "yes" ]; then
+        languages="$languages,objc,obj-c++"
+    fi
     if [ "$do_fortran" = "yes" ]; then
         languages="$languages,fortran"
     fi
@@ -262,12 +270,10 @@ function configure_llvm_gcc() {
     echo "# Configuring llvm-gcc $Release-rc$RC $Flavor"
     echo "# $llvmgcc42_srcdir/configure --prefix=$InstallDir \
         --program-prefix=llvm- --enable-llvm=$llvmObjDir \
-        --enable-languages=$languages \
-        --with-gxx-include-dir=/usr/include/c++/4.2.1"
+        --enable-languages=$languages"
     $llvmgcc42_srcdir/configure --prefix=$InstallDir \
         --program-prefix=llvm- --enable-llvm=$llvmObjDir \
         --enable-languages=$languages \
-        --with-gxx-include-dir=/usr/include/c++/4.2.1 \
         > $LogDir/llvm-gcc.configure.$Release-rc$RC-Phase$Phase-$Flavor.log 2>&1
     cd -
 }
@@ -301,7 +307,7 @@ if [ "$do_checkout" = "yes" ]; then
 fi
 
 (
-Flavors="Debug Release Release-Asserts"
+Flavors="Debug Release Release+Asserts"
 if [ "$do_64bit" = "yes" ]; then
     Flavors="$Flavors Release-64"
 fi