diff --git a/devbuild.sh b/devbuild.sh index 526b1b080a..0199f6f6b2 100755 --- a/devbuild.sh +++ b/devbuild.sh @@ -118,7 +118,7 @@ CONTINUE=false VERBOSE=false # Turn off all apps to build and choose default later -DEFAULT_BUILD=true +DEFAULT_BUILD=true BUILD_UFS="off" BUILD_UFS_UTILS="off" BUILD_UPP="off" @@ -263,7 +263,7 @@ fi RUN_VERSION_FILE="${SRW_DIR}/versions/run.ver.${PLATFORM}" if [ -f ${RUN_VERSION_FILE} ]; then . ${RUN_VERSION_FILE} -fi +fi # set MODULE_FILE for this platform/compiler combination MODULE_FILE="build_${PLATFORM}_${COMPILER}" @@ -352,7 +352,7 @@ if [ "${APPLICATION}" = "ATMAQ" ]; then cp "${SRW_DIR}/sorc/UFS_UTILS/modulefiles/build.${PLATFORM}.${COMPILER}.lua" "${EXTRN_BUILD_MOD_DIR}/mod_ufs-utils.lua" fi if [ "${BUILD_UPP}" = "on" ]; then - cp "${SRW_DIR}/sorc/UPP/modulefiles/${PLATFORM}.lua" "${EXTRN_BUILD_MOD_DIR}/mod_upp.lua" + cp "${SRW_DIR}/sorc/UPP/modulefiles/${PLATFORM}.lua" "${EXTRN_BUILD_MOD_DIR}/mod_upp.lua" fi if [ "${BUILD_NEXUS}" = "on" ]; then cp "${SRW_DIR}/sorc/AQM-utils/parm/nexus_modulefiles/${PLATFORM}.${COMPILER}.lua" "${EXTRN_BUILD_MOD_DIR}/mod_nexus.lua" @@ -449,6 +449,9 @@ if [ $USE_SUB_MODULES = true ]; then else module use ${SRW_DIR}/modulefiles module load ${MODULE_FILE} + if [[ "${PLATFORM}" == "macos" ]]; then + export LDFLAGS+=" -L$MPI_ROOT/lib " + fi fi module list diff --git a/modulefiles/build_macos_gnu.lua b/modulefiles/build_macos_gnu.lua index 36c8b80cdb..266bfd11a6 100644 --- a/modulefiles/build_macos_gnu.lua +++ b/modulefiles/build_macos_gnu.lua @@ -60,7 +60,7 @@ setenv("FFLAGS", " -DNO_QUAD_PRECISION -fallow-argument-mismatch ") if mode() == "load" then LmodMsgRaw([===[ Please export env. variable LDFLAGS after the module is successfully loaded: - > export LDFLAGS=\"-L\$MPI_ROOT/lib \" " + > export LDFLAGS+=" -L$MPI_ROOT/lib " ]===]) end