Commit 4ca5a066 authored by Guillaume DOLLÉ's avatar Guillaume DOLLÉ

fix cling script

parent d4f24ea7
......@@ -8,6 +8,7 @@ LIB_NAME="cling"
LIB_VERSION=0.4.0
GCC_VERSION=6.4.0
CMAKE_VERSION=3.9.2
MODULE_CATEGORY="compilers"
# Use cern repository! (patched version)
LLVM_REPOSITORY=http://root.cern.ch/git/llvm.git
......@@ -28,7 +29,7 @@ DEPEND_MODULE_GCC=gcc${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH
SOURCE_DIR=${BASE_WORK_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
BUILD_DIR=${PREBUILD_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}/build
INSTALL_DIR=${BASE_INSTALL_DIR}/${LIB_NAME}/${LIB_VERSION}/${DEPEND_GCC}
MODULE_DIR=${BASE_MODULE_DIR}/compilers/${LIB_NAME}
MODULE_DIR=${BASE_MODULE_DIR}/${MODULE_CATEGORY}/${LIB_NAME}
MODULE_PATH=${MODULE_DIR}/${LIB_VERSION}_${DEPEND_MODULE_GCC}
......@@ -75,7 +76,7 @@ build_lib() {
fi
module purge
module load gcc/${GCC_VERSION}
module load cmake/${CMAKE_VERSION}_${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
module load cmake/${CMAKE_VERSION}_gcc${GCC_VERSION_MAJOR}${GCC_VERSION_MINOR}${GCC_VERSION_PATCH}
module list
# Check gcc version here
......@@ -107,6 +108,7 @@ install_module()
export LIB_NAME
export LIB_VERSION
export INSTALL_DIR
export MODULE_CATEGORY
envtpl --keep-template -o $MODULE_PATH module.tmpl
}
......
......@@ -5,7 +5,7 @@
proc ModulesHelp { } {
global version prefix
puts stderr "\tcompilers/{{ LIB_NAME }}/{{ LIB_VERSION }} - loads {{ LIB_NAME }} {{ LIB_VERSION }} and its environment"
puts stderr "\t{{ MODULE_CATEGORY }}/{{ LIB_NAME }}/{{ LIB_VERSION }} - loads {{ LIB_NAME }} {{ LIB_VERSION }} and its environment"
}
module-whatis "Loads {{ LIB_NAME }} {{ LIB_VERSION }} and its environment"
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment