sanchayanmaity/minix
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

llvm: Avoid versioning configuration files directly.

Browse source
This commit is contained in:
Cristiano Giuffrida 2014-06-13 20:21:22 +02:00 committed by Lionel Sambuc
parent 2d00147b3f
commit 0e560ca0c8
4 changed files with 4 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
minix/llvm/build.llvm
View file

@ -99,6 +99,7 @@ function check_args()
check_current_dir check_current_dir
# set up the bridge to llvm-apps repository and initialize # 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 . ${MINIX_LLVM_DIR}/minix.inc
. ${ROOT}/apps/scripts/include/configure.llvm.inc . ${ROOT}/apps/scripts/include/configure.llvm.inc

1
minix/llvm/configure.llvm
View file

@ -63,6 +63,7 @@ echo "LLVM root directory is set to :"
echo " ${ROOT}" echo " ${ROOT}"
# Persist the LLVM ROOT path information # 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"` ROOT_1=`echo ${ROOT} | sed "s/\\\//\\\\\\\\\//g"`
sed -i "s/ROOT=.*$/ROOT=\"${ROOT_1}\"/g" ${MINIX_LLVM_DIR}/minix.inc sed -i "s/ROOT=.*$/ROOT=\"${ROOT_1}\"/g" ${MINIX_LLVM_DIR}/minix.inc

2
minix/llvm/minix.inc → minix/llvm/minix.inc.default
View file

@ -93,4 +93,4 @@ TOOLDIR=${DESTDIR}/tooldir.`uname -s`-`uname -r`-`uname -m`/bin
# repository # repository
# #
############################################################################## ##############################################################################
ROOT="/home/koustubha/systems_thesis.lnk/repositories/llvm-apps" ROOT="/nonexistent"

2
minix/llvm/relink.llvm
View file

@ -69,7 +69,6 @@ function find_static_libs()
echo "${stat_libs_llvmapps} ${stat_libs_minix}" echo "${stat_libs_llvmapps} ${stat_libs_minix}"
} }
#Make sure we are running from the right directory #Make sure we are running from the right directory
check_current_dir check_current_dir
@ -80,6 +79,7 @@ if [ "$1" == "--help" ] || [ "$1" == "-h" ]; then
fi fi
# set up the bridge to llvm-apps repository and initialize # 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 . ${MINIX_LLVM_DIR}/minix.inc
. ${ROOT}/apps/scripts/include/configure.llvm.inc . ${ROOT}/apps/scripts/include/configure.llvm.inc