Skip to content
Snippets Groups Projects
Commit 87187651 authored by Siddhant Tibrewal's avatar Siddhant Tibrewal
Browse files

lib64 folder added to fyaml-libs only if it exists (thank you levante); minor...

lib64 folder added to fyaml-libs only if it exists (thank you levante); minor change to run on macos
parent 48797335
No related branches found
No related tags found
1 merge request!46Build process for multiple compilers across different machines
......@@ -54,10 +54,11 @@ function clone_to {
# invoke with the specified CC and CXX if they are present as variables
function invoke_build_script_generation {
if [ -n "$CC" ] && [ -x "${CC}" ] && [ -n "$CXX" ] && [ -x "${CXX}" ] && [ -n "$FC" ] && [ -x "${FC}" ]; then
if [ -n "$CC" ] && [ -n "$CXX" ] && [ -n "$FC" ]; then
echo "invoking.. CC=$CC CXX=$CXX FC=$FC "$@""
CC=$CC CXX=$CXX FC=$FC "$@"
else
echo "invoking.. "$@""
"$@"
fi
}
......@@ -240,11 +241,18 @@ function install_yac {
mkdir -p "$YAC_BUILD_FOLDER"
cd "$YAC_BUILD_FOLDER"
fyaml_lib_folders="$INSTALL_DIR/lib"
if [ -d "$INSTALL_DIR/lib64" ]; then
echo "appending lib64 folder"
fyaml_lib_folders="$INSTALL_DIR/lib -L$INSTALL_DIR/lib64"
fi
invoke_build_script_generation $REPO_PATH/configure --disable-mpi-checks --disable-netcdf --prefix=$INSTALL_DIR \
--with-yaxt-include=$INSTALL_DIR/include \
--with-yaxt-lib=$INSTALL_DIR/lib \
--with-fyaml-include=$INSTALL_DIR/include \
--with-fyaml-lib="-L$INSTALL_DIR/lib -L$INSTALL_DIR/lib64"
--with-fyaml-lib="$fyaml_lib_folders"
make -j "$THREADS"
make install
......
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