[llvm-branch-commits] [llvm-branch] r84044 - /llvm/branches/Apple/Bender-SWB/utils/buildit/build_llvm

[Bill Wendling]

Author: void
Date: Tue Oct 13 17:49:07 2009
New Revision: 84044

URL: http://llvm.org/viewvc/llvm-project?rev=84044&view=rev
Log:
$ svn merge -c 83024 https://llvm.org/svn/llvm-project/llvm/trunk
--- Merging r83024 into '.':
U    utils/buildit/build_llvm


Modified:
    llvm/branches/Apple/Bender-SWB/utils/buildit/build_llvm

Modified: llvm/branches/Apple/Bender-SWB/utils/buildit/build_llvm
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Bender-SWB/utils/buildit/build_llvm?rev=84044&r1=84043&r2=84044&view=diff

==============================================================================
--- llvm/branches/Apple/Bender-SWB/utils/buildit/build_llvm (original)
+++ llvm/branches/Apple/Bender-SWB/utils/buildit/build_llvm Tue Oct 13 17:49:07 2009
@@ -56,9 +56,6 @@
 DARWIN_VERS=`uname -r | sed 's/\..*//'`
 echo DARWIN_VERS = $DARWIN_VERS
 
-# If the user has CC set in their environment unset it now
-unset CC
-
 DT_HOME=$DEST_DIR/Developer/usr
 DEST_ROOT="/Developer$DEST_ROOT"
 if [ "x$DEVELOPER_BIN" != "x" ]; then
@@ -81,6 +78,15 @@
 mkdir -p $DIR/obj-llvm || exit 1
 cd $DIR/obj-llvm || exit 1
 
+# If the user has set CC or CXX, respect their wishes.  If not,
+# compile with LLVM-GCC/LLVM-G++ if available; if LLVM is not
+# available, fall back to usual GCC/G++ default.
+XTMPCC=$(which llvm-gcc)
+if [ x$CC  = x -a x$XTMPCC != x ] ; then export CC=$XTMPCC  ; fi
+XTMPCC=$(which llvm-g++)
+if [ x$CXX = x -a x$XTMPCC != x ] ; then export CXX=$XTMPCC ; fi
+unset XTMPCC
+
 if [ \! -f Makefile.config ]; then
     $SRC_DIR/configure --prefix=$DT_HOME/local \
         --enable-targets=arm,x86,powerpc,cbe \
@@ -141,7 +147,7 @@
     CXXFLAGS="-DLLVM_VERSION_INFO='\" Apple Build #$LLVM_VERSION\"'" \
     VERBOSE=1
 
-if ! test $? == 0 ; then
+if [ $? != 0 ] ; then
     echo "error: LLVM 'make' failed!"
     exit 1
 fi