From: Cristiano Giuffrida <giuffrida@cs.vu.nl>
Date: Sun, 22 Jun 2014 08:31:30 +0000 (+0200)
Subject: llvm: Use default LLVMPREFIX when building passes.
X-Git-Tag: v3.3.0~144
X-Git-Url: http://zhaoyanbai.com/repos/%22http:/www.isc.org/icons/zlib_tech.html?a=commitdiff_plain;h=5119c2fe3a69d0b0d1ab2617af1667d300e0ee71;p=minix.git

llvm: Use default LLVMPREFIX when building passes.
---

diff --git a/minix/llvm/generate_gold_plugin.sh b/minix/llvm/generate_gold_plugin.sh
index ea88b3cb4..e1b471867 100755
--- a/minix/llvm/generate_gold_plugin.sh
+++ b/minix/llvm/generate_gold_plugin.sh
@@ -61,7 +61,7 @@ cp ${OBJ_LLVM}/./Release+Asserts/bin/llvm-* ${CROSS_TOOLS}
 
 # Generate and Install default MINIX passes
 cd ${NETBSDSRCDIR}/minix/llvm/passes/WeakAliasModuleOverride
-make LLVMPREFIX=${OBJ_LLVM}/./Release+Asserts/ install
+make install
 
 cd ${NETBSDSRCDIR}/minix/llvm/passes/hello
-make LLVMPREFIX=${OBJ_LLVM}/./Release+Asserts/ install
+make install
diff --git a/minix/llvm/passes/Makefile.inc b/minix/llvm/passes/Makefile.inc
new file mode 100644
index 000000000..3c153a6ba
--- /dev/null
+++ b/minix/llvm/passes/Makefile.inc
@@ -0,0 +1 @@
+LLVMPREFIX?=../../../../../obj_llvm.i386/Release+Asserts
diff --git a/minix/llvm/passes/WeakAliasModuleOverride/Makefile b/minix/llvm/passes/WeakAliasModuleOverride/Makefile
index cb708a802..7de1b8085 100644
--- a/minix/llvm/passes/WeakAliasModuleOverride/Makefile
+++ b/minix/llvm/passes/WeakAliasModuleOverride/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.inc
+
 QUIET=@
 ECHO=echo
 CP=cp
diff --git a/minix/llvm/passes/hello/Makefile b/minix/llvm/passes/hello/Makefile
index 744dc90f8..ca848156d 100644
--- a/minix/llvm/passes/hello/Makefile
+++ b/minix/llvm/passes/hello/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.inc
+
 QUIET=@
 ECHO=echo
 CP=cp