Skip to content
Snippets Groups Projects
Unverified Commit 08be8c49 authored by lintao@ihep.ac.cn's avatar lintao@ihep.ac.cn Committed by GitHub
Browse files

Merge pull request #195 from mirguest/master

Allow to use the CEPCSW_BLDTOOL to specify the build tool is make or ninja in run.sh
parents 5cd25f6b fb8ee579
No related branches found
No related tags found
No related merge requests found
...@@ -30,6 +30,10 @@ function check-cepcsw-envvar() { ...@@ -30,6 +30,10 @@ function check-cepcsw-envvar() {
function build-dir() { function build-dir() {
local blddir=build local blddir=build
if [ -n "${bldtool}" ]; then
blddir=${blddir}.${bldtool}
fi
# If detect the extra env var, append it to the build dir # If detect the extra env var, append it to the build dir
if [ -n "${lcg_version}" ]; then if [ -n "${lcg_version}" ]; then
blddir=${blddir}.${lcg_version} blddir=${blddir}.${lcg_version}
...@@ -65,6 +69,8 @@ function run-job() { ...@@ -65,6 +69,8 @@ function run-job() {
lcg_platform=x86_64-centos7-gcc8-opt lcg_platform=x86_64-centos7-gcc8-opt
lcg_version=98.0.0 lcg_version=98.0.0
bldtool=${CEPCSW_BLDTOOL} # make, ninja # set in env var
check-cepcsw-envvar || exit -1 check-cepcsw-envvar || exit -1
check-working-builddir || exit -1 check-working-builddir || exit -1
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment