From 66be6d851d925e777ca90153c5f800728db85c56 Mon Sep 17 00:00:00 2001 From: edoapra Date: Fri, 26 May 2023 13:21:02 -0700 Subject: [PATCH 1/2] fix for gfortran --- src/config/strip_compiler.sh | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/config/strip_compiler.sh b/src/config/strip_compiler.sh index 6378bb601e..c9d97dda1b 100755 --- a/src/config/strip_compiler.sh +++ b/src/config/strip_compiler.sh @@ -5,6 +5,8 @@ if [[ "$1" == *fortran* ]] && [[ ! -z $_FC ]]; then echo $_FC elif [[ "$1" == *cc* ]] && [[ ! -z $_CC ]]; then echo $_CC +elif [[ "$1" == *gfortran* ]] ; then + echo gfortran else echo $(basename -- $1 | cut -d \- -f 1 | sed 's/[0-9]*//g') fi From dd5a6af66b719995bae7e03562dcf1ac249dc164 Mon Sep 17 00:00:00 2001 From: edoapra Date: Fri, 26 May 2023 13:22:03 -0700 Subject: [PATCH 2/2] fix for conda builds --- src/libext/tblite/build_tblite_cmake.sh | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/libext/tblite/build_tblite_cmake.sh b/src/libext/tblite/build_tblite_cmake.sh index 0095f74f49..38c5801d5e 100755 --- a/src/libext/tblite/build_tblite_cmake.sh +++ b/src/libext/tblite/build_tblite_cmake.sh @@ -82,6 +82,7 @@ if [[ -n ${FC} ]] && [[ ${FC} == ftn ]]; then fi FC_EXTRA=$(${NWCHEM_TOP}/src/config/strip_compiler.sh ${FC}) +echo FC_EXTRA is $FC_EXTRA #Intel MPI if [[ -z "$I_MPI_F90" ]] ; then @@ -196,7 +197,9 @@ fi if [[ ${FC} == nvfortran ]] || [[ ${FC} == pgf90 ]]; then Fortran_FLAGS+="-Mbackslash -fast -tp host" fi - +if [ ! -z "${CONDA_BUILD_SYSROOT}" ]; then + Fortran_FLAGS+="-Wl,-rpath,${PREFIX}/lib -L${PREFIX}/lib" +fi if [[ -z "$USE_OPENMP" ]]; then DOOPENMP=OFF else