diff --git a/hpvm/llvm_installer/llvm_installer.sh b/hpvm/llvm_installer/llvm_installer.sh index 162884627e93a3bdccb4efb642aa550e6435da8e..e4bdd5b3eebe7ab655ad890f3de5c09613fd91f5 100755 --- a/hpvm/llvm_installer/llvm_installer.sh +++ b/hpvm/llvm_installer/llvm_installer.sh @@ -21,6 +21,20 @@ LIBCXX_SRC="libcxx-$VERSION.src" LIBCXXABI_SRC="libcxxabi-$VERSION.src" LLD_SRC="lld-$VERSION.src" +AUTOMATE="y" + +read -n 1 -p "Build and install HPVM automatically? (y or n): " AUTOMATE + +echo +read -n 2 -p "Number of threads: " NUM_THREADS + +if [ ! $NUM_THREADS -gt 0 ]; then + NUM_THREADS = 2 + echo + echo Using $NUM_THREADS threads by default. + echo +fi + if [ -d $LLVM_SRC ]; then echo Found $LLVM_SRC! @@ -163,11 +177,6 @@ cd $CURRENT_DIR/llvm_patches /bin/bash ./apply_patch.sh echo Patches applied. -echo - -AUTOMATE="y" - -read -n 1 -p "Build and install HPVM automatically? (y or n): " AUTOMATE if [ ! $AUTOMATE == "y" ]; then echo @@ -175,16 +184,6 @@ if [ ! $AUTOMATE == "y" ]; then exit fi -echo -echo -read -n 2 -p "Number of threads: " NUM_THREADS - -if [ ! $NUM_THREADS -gt 0 ]; then - NUM_THREADS = 2 - echo - echo Using $NUM_THREADS threads by default. -fi - echo echo Now building...