From: Cristiano Giuffrida <giuffrida@cs.vu.nl>
Date: Wed, 18 Jun 2014 10:46:27 +0000 (+0200)
Subject: llvm: Use common.overrides* files the llvm-apps way.
X-Git-Tag: v3.3.0~152
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/man.named.html?a=commitdiff_plain;h=4ddc42d97a296a0c6b53da183b3bbcb79d3017cb;p=minix.git

llvm: Use common.overrides* files the llvm-apps way.
---

diff --git a/minix/llvm/configure.llvm b/minix/llvm/configure.llvm
index 5dc67809e..e4602ae8e 100755
--- a/minix/llvm/configure.llvm
+++ b/minix/llvm/configure.llvm
@@ -68,8 +68,8 @@ ROOT_1=`echo ${ROOT} | sed "s/\\\//\\\\\\\\\//g"`
 sed -i "s/ROOT=.*$/ROOT=\"${ROOT_1}\"/g" ${MINIX_LLVM_DIR}/common.inc
 
 # Configure llvm-apps
-cp ${ROOT}/conf/common.minix.overrides.inc ${ROOT}/common.minix.overrides.inc
-sed -i "s/MINIX_ROOT=.*$/MINIX_ROOT=\"${MINIX_ROOT}\"/g" ${ROOT}/common.minix.overrides.inc
+cp ${ROOT}/conf/common.overrides.llvm-minix.inc ${ROOT}/common.overrides.llvm.inc
+sed -i "s/MINIX_ROOT=.*$/MINIX_ROOT=\"${MINIX_ROOT}\"/g" ${ROOT}/common.overrides.llvm.inc
 
 if [ ! -d ${ROOT}/.tmp ]; then
 	mkdir ${ROOT}/.tmp 2>/dev/null || true
@@ -139,4 +139,4 @@ fi
 
 # Reconfigure llvm-apps
 MINIX_TOOLS_DIR=$(readlink -f ${MINIX_ROOT}/obj.386/tooldir.*)
-sed -i "s/MINIX_TOOLS_DIR=.*$/MINIX_TOOLS_DIR=\"${MINIX_TOOLS_DIR}\"/g" ${ROOT}/common.minix.overrides.inc
+sed -i "s/MINIX_TOOLS_DIR=.*$/MINIX_TOOLS_DIR=\"${MINIX_TOOLS_DIR}\"/g" ${ROOT}/common.overrides.llvm.inc