build.llvm: including configure.llvm.inc must be optional

diff --git a/minix/llvm/build.llvm b/minix/llvm/build.llvm
index 142f47084faceacf1bad76113d0bb2b376a11bde..641af4dfe5601c72f87f151fc73e6cf3a43f0c05 100755 (executable)
--- a/minix/llvm/build.llvm
+++ b/minix/llvm/build.llvm
@@ -76,17 +76,17 @@ function check_args()
                elif [ -f "${MINIX_LLVM_BIN_DIR}/${llvmpass}.so" ]; then
                        llvmpass_path="${MINIX_LLVM_BIN_DIR}/${llvmpass}.so"
                else
-                       echo "The LLVM pass file ${llvmpass}.so doesn't exit."
+                       echo "The LLVM pass file ${llvmpass}.so doesn't exist."
                        exit_flag=1
                fi
                LLVMPASS_PATHS+=" -load=${llvmpass_path} -${llvmpass}"
+               LLVMPASS+=" ${llvmpass}"
        done
 
        if [ ${exit_flag} == 1 ]; then
-               echo "Searched in:"
+               echo "Searched in the following location(s):"
                echo "  ${INSTALL_DIR}" 
-               echo "          and"
-               echo "  ${MINIX_LLVM_BIN_DIR}."
+               echo "  ${MINIX_LLVM_BIN_DIR}"
                exit 1
        fi
 
@@ -99,7 +99,7 @@ check_current_dir
 
 # set up the bridge to llvm-apps repository and initialize
 . ${MINIX_LLVM_DIR}/minix.inc
-. ${ROOT}/apps/scripts/include/configure.llvm.inc
+[ ! -f ${ROOT}/apps/scripts/include/configure.llvm.inc ] || . ${ROOT}/apps/scripts/include/configure.llvm.inc
 
 # Arguments check
 check_args "$@"