From: Cristiano Giuffrida <giuffrida@cs.vu.nl>
Date: Fri, 13 Jun 2014 18:21:22 +0000 (+0200)
Subject: llvm: Avoid versioning configuration files directly.
X-Git-Tag: v3.3.0~158
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/man.dnssec-checkds.html?a=commitdiff_plain;h=0e560ca0c847b8839997f9fb2b035105125fa083;p=minix.git

llvm: Avoid versioning configuration files directly.
---

diff --git a/minix/llvm/build.llvm b/minix/llvm/build.llvm
index bd25df783..762c643b5 100755
--- 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 9896e83c0..c53ed22cd 100755
--- 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 4b772e24e..1d29b5efa 100644
--- 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 a9a6e9a9e..6bdfa9d26 100755
--- 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