From 34e983c67e72ce7283a3a1db37c50032f81232d2 Mon Sep 17 00:00:00 2001 From: Akash Kothari <akashk4@tyler.cs.illinois.edu> Date: Tue, 4 Feb 2020 00:19:32 -0600 Subject: [PATCH] Minor modifications to hpvm-config ReadME and llvm installer --- hpvm/scripts/llvm_installer.sh | 17 +++++------------ hpvm/tools/README.md | 4 ++++ 2 files changed, 9 insertions(+), 12 deletions(-) diff --git a/hpvm/scripts/llvm_installer.sh b/hpvm/scripts/llvm_installer.sh index 3d7babf050..9c71f865c0 100755 --- a/hpvm/scripts/llvm_installer.sh +++ b/hpvm/scripts/llvm_installer.sh @@ -40,9 +40,9 @@ fi if [ -d $LLVM_SRC ]; then - echo Found $LLVM_SRC! + echo Found $LLVM_SRC, not dowloading it again! elif [ -d llvm ]; then - echo Found llvm, not downloading $LLVM_SRC! + echo Found LLVM, not downloading it again! else echo $WGET $URL/$VERSION/$LLVM_SRC$SUFFIX $WGET $URL/$VERSION/$LLVM_SRC$SUFFIX @@ -56,7 +56,7 @@ if [ -d $LLVM_SRC ]; then elif [ -d llvm ]; then echo Everything looks sane. else - echo Install had problems. Quitting. + echo Problem with LLVM download. Exiting! exit fi @@ -66,7 +66,7 @@ if [ -d $CURRENT_DIR/$LLVM_SRC/tools ]; then cd $CURRENT_DIR/$LLVM_SRC/tools echo In tools. else - echo Fail! Something is wrong with your $LLVM_SRC checkout! + echo Something is wrong with LLVM checkout. Exiting! exit 1 fi @@ -80,20 +80,13 @@ else if [ -d clang ]; then echo Everything looks sane. else - echo Install had problems. Quitting. + echo Problem with clang download. Exiting! exit fi fi cd $CURRENT_DIR -if [ -d $CURRENT_DIR/$LLVM_SRC/projects ]; then - cd $CURRENT_DIR/$LLVM_SRC/projects -else - echo Fail! Something is wrong wint $LLVM_SRC. - exit 1 -fi - HPVM_DIR=$CURRENT_DIR/$LLVM_SRC/tools/hpvm if [ ! -d $HPVM_DIR ]; then diff --git a/hpvm/tools/README.md b/hpvm/tools/README.md index c2c2e04bf9..4609a86407 100644 --- a/hpvm/tools/README.md +++ b/hpvm/tools/README.md @@ -11,6 +11,10 @@ flags required to compile HPVM programs. ### Options –version: Print the version number of HPVM. +-llvm-version: Print LLVM version. + +-hpvm-version: Print HPVM version. + -help: Print a summary of llvm-config arguments. –prefix: Print the installation prefix for LLVM. -- GitLab