From bde1bbed16c98d051fba3ad194c36714fa22fc8e Mon Sep 17 00:00:00 2001 From: Devang Patel Date: Fri, 11 Apr 2008 17:45:39 +0000 Subject: [PATCH] Change llvm tools install location. llvm-svn: 49540 --- llvm/utils/buildit/build_llvm | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/llvm/utils/buildit/build_llvm b/llvm/utils/buildit/build_llvm index 2ea0a29dafed..51fdf35c9d9a 100755 --- a/llvm/utils/buildit/build_llvm +++ b/llvm/utils/buildit/build_llvm @@ -59,6 +59,11 @@ 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 +if [ "x$DEVELOPER_BIN" != "x" ]; then +DT_HOME=$DEST_DIR/$DEVELOPER_DIR/usr +fi + ################################################################################ # Run the build. @@ -75,7 +80,7 @@ mkdir -p $DIR/obj-llvm || exit 1 cd $DIR/obj-llvm || exit 1 if [ \! -f Makefile.config ]; then - $SRC_DIR/llvm/configure --prefix=$DEST_DIR$DEST_ROOT \ + $SRC_DIR/llvm/configure --prefix=$DT_HOME/local \ --enable-targets=x86,powerpc,cbe \ --enable-assertions=$LLVM_ASSERTIONS \ --enable-optimized=$LLVM_OPTIMIZED \ @@ -145,14 +150,9 @@ else fi cd $DEST_DIR$DEST_ROOT -# LTO is part of developer tools -LTO_HOME=$DEST_DIR//Developer/usr -if [ "x$DEVELOPER_BIN" != "x" ]; then -LTO_HOME=$DEST_DIR/$DEVELOPER_DIR/usr -fi -mkdir -p $LTO_HOME/lib -mv lib/libLTO.dylib $LTO_HOME/lib/libLTO.dylib +mkdir -p $DT_HOME/lib +mv lib/libLTO.dylib $DT_HOME/lib/libLTO.dylib rm -f lib/libLTO.a lib/libLTO.la