diff --git a/distro/scripts/adl_cots.sh b/distro/scripts/adl_cots.sh index 5694ef6bbe5d1aa4906050271de5053ae061f310..8ecdbb16c0d79771d4813457aa15ed80335d6bb1 100755 --- a/distro/scripts/adl_cots.sh +++ b/distro/scripts/adl_cots.sh @@ -65,7 +65,7 @@ echo "PATH" $PATH export LD_LIBRARY_PATH=${USER_COTS_PATH}/lib64:${USER_COTS_PATH}/lib:${LD_LIBRARY_PATH} export LD_RUN_PATH=${USER_COTS_PATH}/lib64:${USER_COTS_PATH}/lib:${LD_RUN_PATH} export PATH=${USER_COTS_PATH}/bin:$PATH -export LDFLAGS="-L${USER_COTS_PATH}/lib " +export LDFLAGS="-L${USER_COTS_PATH}/lib -L${USER_COTS_PATH}/lib64 " install_the_source (){ echo ${FUNCNAME[0]} # This will download and unpack the requested COT. If the cot is already present it will not be downloaded. @@ -473,7 +473,7 @@ mk_hl_region() export HDF5_INSTALL_DIR=${USER_COTS_PATH} && \ linc=`pwd` && \ make clean && \ - make CC=$CC INCLUDES="$CPPFLAGS -I${USER_COTS_PATH}/include -I$linc/src $LDFLAGS -lhdf5 -lhdf5_hl -lm" && \ + make CC=$CC INCLUDES="$CPPFLAGS -I${USER_COTS_PATH}/include -I$linc/src $LDFLAGS -lhdf5 -lhdf5_hl -lm" && \ make PREFIX=${USER_COTS_PATH} install && \ echo "${FUNCNAME[0]} finished" && \ return 0 @@ -486,10 +486,9 @@ mk_nagg(){ install_the_source ${tar_name} && \ cd nagg-1.6.2 && \ patch -p1 < ${COTS_HOME}/scripts/revised_nagg.patch && \ - ./configure --prefix=${USER_COTS_PATH} --exec-prefix="${USER_COTS_PATH}" --with-hlregion="${USER_COTS_PATH}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS=" ${LDFLAGS}" && \ + ./configure --prefix=${USER_COTS_PATH} --exec-prefix="${USER_COTS_PATH}" --with-hlregion="${USER_COTS_PATH}/lib" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" && \ make && \ make install && \ - unset LDFLAGS && \ echo "${FUNCNAME[0]} finished" && \ return 0 }