made change to installer to not compiler visc-rt separately

hpvm/llvm_installer/llvm_installer.sh

@@ -34,6 +34,7 @@ else
     echo $WGET $URL/$VERSION/$LLVM_SRC$SUFFIX
     $WGET $URL/$VERSION/$LLVM_SRC$SUFFIX
     tar xf $LLVM_SRC$SUFFIX
+    rm $LLVM_SRC$SUFFIX
 fi
 
 if [ -d $LLVM_SRC ]; then
@@ -61,6 +62,7 @@ if [ -d clang ]; then
 else
     $WGET $URL/$VERSION/$CLANG_SRC$SUFFIX
     tar xf $CLANG_SRC$SUFFIX
+    rm $CLANG_SRC$SUFFIX
     mv $CLANG_SRC clang
     if [ -d clang ]; then
 	echo Everything looks sane.
@@ -84,6 +86,7 @@ if [ -d compiler-rt ]; then
 else
     $WGET $URL/$VERSION/$RT_SRC$SUFFIX
     tar xf $RT_SRC$SUFFIX
+    rm $RT_SRC$SUFFIX
     mv $RT_SRC compiler-rt
     if [ -d compiler-rt ]; then
 	echo Everything looks sane.
@@ -98,6 +101,7 @@ if [ -d libcxx ]; then
 else
     $WGET $URL/$VERSION/$LIBCXX_SRC$SUFFIX
     tar xf $LIBCXX_SRC$SUFFIX
+    rm $LIBCXX_SRC$SUFFIX
     mv $LIBCXX_SRC libcxx
     if [ -d libcxx ]; then
 	echo Everything looks sane.
@@ -113,6 +117,7 @@ if [ $LIBCXXABI_SRC != "" ]; then
     else
 	$WGET $URL/$VERSION/$LIBCXXABI_SRC$SUFFIX
 	tar xf $LIBCXXABI_SRC$SUFFIX
+	rm $LIBCXXABI_SRC$SUFFIX
 	mv $LIBCXXABI_SRC libcxxabi
 	if [ -d libcxxabi ]; then
 	    echo Everything looks sane.
@@ -129,6 +134,7 @@ if [ $LLD_SRC != "" ]; then
     else
 	$WGET $URL/$VERSION/$LLD_SRC$SUFFIX
 	tar xf $LLD_SRC$SUFFIX
+	rm $LLD_SRC$SUFFIX
 	mv $LLD_SRC lld
 	if [ -d lld ]; then
 	    echo Everything looks sane.
@@ -139,25 +145,20 @@ if [ $LLD_SRC != "" ]; then
     fi
 fi
 
-echo Adding HPVM sources to tree
-if [ -d $CURRENT_DIR/$LLVM_SRC/tools/hpvm ]; then
-  mkdir $CURRENT_DIR/$LLVM_SRC/tools/hpvm
+HPVM_DIR=$CURRENT_DIR/$LLVM_SRC/tools/hpvm
+if [ ! -d $HPVM_DIR ]; then
+  echo Adding HPVM sources to tree
+  mkdir -p $HPVM_DIR
+  ln -s $CURRENT_DIR/CMakeLists.txt $HPVM_DIR
+  ln -s $CURRENT_DIR/include $HPVM_DIR/
+  ln -s $CURRENT_DIR/lib $HPVM_DIR/
+  ln -s $CURRENT_DIR/projects $HPVM_DIR/
+  ln -s $CURRENT_DIR/test $HPVM_DIR/
 else
   echo $CURRENT_DIR/$LLVM_SRC/tools/hpvm exists.
 fi
 
-HPVM_DIR=$CURRENT_DIR/$LLVM_SRC/tools/hpvm
-mkdir -p $HPVM_DIR
-ln -s $CURRENT_DIR/CMakeLists.txt $HPVM_DIR
-ln -s $CURRENT_DIR/include $HPVM_DIR/
-ln -s $CURRENT_DIR/lib $HPVM_DIR/
-ln -s $CURRENT_DIR/projects $HPVM_DIR/
-ln -s $CURRENT_DIR/test $HPVM_DIR/
-
-ls $HPVM_DIR
-
 export LLVM_SRC_ROOT=$CURRENT_DIR/$LLVM_SRC
-echo ${LLVM_SRC_ROOT}
 
 echo Applying HPVM patches
 cd $CURRENT_DIR/llvm_patches
@@ -178,10 +179,10 @@ echo make -j$NUM_THREADS
 make -j$NUM_THREADS
 #make install
 
-echo Building HPVM runtime
-HPVM_RT_DIR=$HPVM_DIR/projects/visc-rt
-cd $HPVM_RT_DIR
-make
+#echo Building HPVM runtime
+#HPVM_RT_DIR=$HPVM_DIR/projects/visc-rt
+#cd $HPVM_RT_DIR
+#make
 
 #cp -r $CURRENT_DIR/projects $HPVM_DIR/
 #make -j$NUM_THREADS