From eba14763897bb8f353c4e7471898788596a26ba5 Mon Sep 17 00:00:00 2001 From: David van Moolenbroek Date: Sat, 14 Nov 2015 04:53:50 +0100 Subject: [PATCH] generate_gold_plugin: support for MAKE variable The user of the script may now override the default name of the host platform's GNU make utility by passing in a MAKE variable. Along with the previous commits and upcoming documentation changes, this fixes #93. Change-Id: I97fc501413ade50c48ebb5471584f9281ae45a11 --- minix/llvm/generate_gold_plugin.sh | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/minix/llvm/generate_gold_plugin.sh b/minix/llvm/generate_gold_plugin.sh index d1c836da1..a022e160b 100755 --- a/minix/llvm/generate_gold_plugin.sh +++ b/minix/llvm/generate_gold_plugin.sh @@ -9,6 +9,7 @@ cd $(dirname $0) : ${OBJ_LLVM=${NETBSDSRCDIR}/../obj_llvm.${ARCH}} : ${OBJ=${NETBSDSRCDIR}/../obj.${ARCH}} : ${CROSS_TOOLS=${OBJ}/"tooldir.`uname -s`-`uname -r`-`uname -m`"/bin} +: ${MAKE=make} echo ${NETBSDSRCDIR} echo ${LLVMSRCDIR} @@ -36,7 +37,7 @@ ${LLVMSRCDIR}/llvm/configure \ --disable-debug-symbols \ --enable-assertions \ --enable-bindings=none \ - llvm_cv_gnu_make_command=make \ + llvm_cv_gnu_make_command=${MAKE} \ ac_cv_path_CIRCO="echo circo" \ ac_cv_path_DOT="echo dot" \ ac_cv_path_DOTTY="echo dotty" \ @@ -46,7 +47,7 @@ ${LLVMSRCDIR}/llvm/configure \ ac_cv_path_XDOT="echo xdot" \ --enable-optimized -make -j ${JOBS} +${MAKE} -j ${JOBS} # Copy the gold plugin where the NetBSD build system expects it. mkdir -p ${NETBSDSRCDIR}/minix/llvm/bin/ @@ -61,16 +62,16 @@ cp ${OBJ_LLVM}/./Release+Asserts/bin/llvm-* ${CROSS_TOOLS} # Generate and Install default MINIX passes cd ${NETBSDSRCDIR}/minix/llvm/passes/WeakAliasModuleOverride -make install +${MAKE} install cd ${NETBSDSRCDIR}/minix/llvm/passes/hello -make install +${MAKE} install cd ${NETBSDSRCDIR}/minix/llvm/passes/sectionify -make install +${MAKE} install cd ${NETBSDSRCDIR}/minix/llvm/passes/magic -make install +${MAKE} install cd ${NETBSDSRCDIR}/minix/llvm/passes/asr -make install +${MAKE} install -- 2.44.0