llvm: Use default LLVMPREFIX when building passes.

diff --git a/minix/llvm/generate_gold_plugin.sh b/minix/llvm/generate_gold_plugin.sh
index ea88b3cb41c1c3f596fafbc7dfbc082e56125b8a..e1b4718677f1c0affce2e4632645343ea2081dd4 100755 (executable)
--- 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 (file)
index 0000000..3c153a6
--- /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 cb708a802981b9651d5f12f6de98ec3a1855a6e9..7de1b80856fe3ffe2cbb0e7f474c4d622842d3c4 100644 (file)
--- 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 744dc90f8f83c4ec9bf7f0454e8ec3e385f17309..ca848156da2ffc363868239f5e507163baa12919 100644 (file)
--- a/minix/llvm/passes/hello/Makefile
+++ b/minix/llvm/passes/hello/Makefile
@@ -1,3 +1,5 @@
+include ../Makefile.inc
+
 QUIET=@
 ECHO=echo
 CP=cp