File tree Expand file tree Collapse file tree 2 files changed +17
-2
lines changed
Expand file tree Collapse file tree 2 files changed +17
-2
lines changed Original file line number Diff line number Diff line change @@ -90,7 +90,15 @@ setenv GEOSDIR @GEOSDIR
9090setenv GEOSBIN @GEOSBIN
9191
9292source $GEOSBIN /g5_modules
93- setenv @LD_LIBRARY_PATH_CMD ${LD_LIBRARY_PATH} :${GEOSDIR} /lib
93+
94+
95+ # We only prepend to DY/LD_LIBRARY_PATH if it exists
96+ if ( $? @LD_LIBRARY_PATH_CMD ) then
97+ setenv @LD_LIBRARY_PATH_CMD " ${@ LD_LIBRARY_PATH_CMD} :${GEOSDIR} /lib"
98+ else
99+ setenv @LD_LIBRARY_PATH_CMD " ${GEOSDIR} /lib"
100+ endif
101+
94102# We only add BASEDIR to the @LD_LIBRARY_PATH_CMD if BASEDIR is defined (i.e., not running with Spack)
95103if ( $? BASEDIR ) then
96104 setenv @LD_LIBRARY_PATH_CMD ${@ LD_LIBRARY_PATH_CMD} :${BASEDIR} /${ARCH} /lib
Original file line number Diff line number Diff line change @@ -33,7 +33,14 @@ setenv GEOSETC @GEOSETC
3333setenv GEOSUTIL @GEOSSRC
3434
3535source $GEOSBIN /g5_modules
36- setenv @LD_LIBRARY_PATH_CMD " ${LD_LIBRARY_PATH} :${GEOSDIR} /lib"
36+
37+ # We only prepend to DY/LD_LIBRARY_PATH if it exists
38+ if ( $? @LD_LIBRARY_PATH_CMD ) then
39+ setenv @LD_LIBRARY_PATH_CMD " ${@ LD_LIBRARY_PATH_CMD} :${GEOSDIR} /lib"
40+ else
41+ setenv @LD_LIBRARY_PATH_CMD " ${GEOSDIR} /lib"
42+ endif
43+
3744# We only add BASEDIR to the @LD_LIBRARY_PATH_CMD if BASEDIR is defined (i.e., not running with Spack)
3845if ( $? BASEDIR ) then
3946 setenv @LD_LIBRARY_PATH_CMD " ${@ LD_LIBRARY_PATH_CMD} :${BASEDIR} /${ARCH} /lib"
You can’t perform that action at this time.
0 commit comments