llvm: Avoid versioning configuration files directly.

diff --git a/minix/llvm/build.llvm b/minix/llvm/build.llvm
index bd25df78305b688de3fac21701c8f26b83d1b304..762c643b5cc9af313652c4936145712e2369c5c9 100755 (executable)
--- a/minix/llvm/build.llvm
+++ b/minix/llvm/build.llvm
@@ -99,6 +99,7 @@ function check_args()
 check_current_dir
 
 # set up the bridge to llvm-apps repository and initialize
+[ -f ${MINIX_LLVM_DIR}/minix.inc ] || cp ${MINIX_LLVM_DIR}/minix.inc.default ${MINIX_LLVM_DIR}/minix.inc
 . ${MINIX_LLVM_DIR}/minix.inc
 . ${ROOT}/apps/scripts/include/configure.llvm.inc
 

diff --git a/minix/llvm/configure.llvm b/minix/llvm/configure.llvm
index 9896e83c0224dfe6c05b1d39059975bbf520a5e5..c53ed22cd99e55f49b1acc1b3b4b61e2dd48b0f9 100755 (executable)
--- a/minix/llvm/configure.llvm
+++ b/minix/llvm/configure.llvm
@@ -63,6 +63,7 @@ echo "LLVM root directory is set to :"
 echo "  ${ROOT}"
 
 # Persist the LLVM ROOT path information
+[ -f ${MINIX_LLVM_DIR}/minix.inc ] || cp ${MINIX_LLVM_DIR}/minix.inc.default ${MINIX_LLVM_DIR}/minix.inc
 ROOT_1=`echo ${ROOT} | sed "s/\\\//\\\\\\\\\//g"`
 sed -i "s/ROOT=.*$/ROOT=\"${ROOT_1}\"/g" ${MINIX_LLVM_DIR}/minix.inc
 

diff --git a/minix/llvm/minix.inc b/minix/llvm/minix.inc.default
similarity index 97%
rename from minix/llvm/minix.inc
rename to minix/llvm/minix.inc.default
index 4b772e24e41a1cd1c05477bf93d95938474ef600..1d29b5efae08bcc334d478e222a4f52ea15141de 100644 (file)
--- a/minix/llvm/minix.inc
+++ b/minix/llvm/minix.inc.default
@@ -93,4 +93,4 @@ TOOLDIR=${DESTDIR}/tooldir.`uname -s`-`uname -r`-`uname -m`/bin
 # repository
 # 
 ##############################################################################
-ROOT="/home/koustubha/systems_thesis.lnk/repositories/llvm-apps"
+ROOT="/nonexistent"

diff --git a/minix/llvm/relink.llvm b/minix/llvm/relink.llvm
index a9a6e9a9e30cd5a7a47b754a89e91ec210d6695a..6bdfa9d2667cf9d61fb2b6bd978de8c8ebd87e4d 100755 (executable)
--- a/minix/llvm/relink.llvm
+++ b/minix/llvm/relink.llvm
@@ -69,7 +69,6 @@ function find_static_libs()
        echo "${stat_libs_llvmapps} ${stat_libs_minix}"
 }
 
-
 #Make sure we are running from the right directory
 check_current_dir
 
@@ -80,6 +79,7 @@ if [ "$1" == "--help" ] || [ "$1" == "-h" ]; then
 fi
 
 # set up the bridge to llvm-apps repository and initialize
+[ -f ${MINIX_LLVM_DIR}/minix.inc ] || cp ${MINIX_LLVM_DIR}/minix.inc.default ${MINIX_LLVM_DIR}/minix.inc
 . ${MINIX_LLVM_DIR}/minix.inc
 . ${ROOT}/apps/scripts/include/configure.llvm.inc