comp-chem/NWChem
1
0
Fork 0
mirror of https://github.com/nwchemgit/nwchem.git synced 2026-07-29 06:35:39 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Merge pull request #1128 from edoapra/makemay2025

Browse source 
cleanup
This commit is contained in:
NWChem: Open Source High-Performance Computational Chemistry 2025-05-21 21:59:49 -07:00 • committed by GitHub
commit 8fbaa0f3d4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 18 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/config/makefile.h
View file

@ -3762,19 +3762,16 @@ endif
# lower level libs used by communication libraries
#case guard against case when tools have not been compiled yet
ifeq ("$(wildcard ${GA_PATH}/bin/ga-config)","")
else
#ifeq ("$(wildcard ${GA_PATH}/bin/ga-config)","")
#else
ifneq ($(ARMCI_NETWORK),$(findstring $(ARMCI_NETWORK), MPI-PR MPI-TS MPI-PT MPI-MT MPI3))
COMM_LIBS = $(shell ${GA_PATH}/bin/ga-config --network_ldflags)
COMM_LIBS += $(shell ${GA_PATH}/bin/ga-config --network_libs)
COMM_LIBS = $(shell $(GA_PATH)/bin/ga-config --network_ldflags)
COMM_LIBS += $(shell $(GA_PATH)/bin/ga-config --network_libs)
endif
COMM_LIBS += $(shell [ -e $(GA_PATH)/bin/comex-config ] && ${GA_PATH}/bin/comex-config --libs) -lpthread
ifdef COMM_LIBS
CORE_LIBS += $(COMM_LIBS)
endif
#comex bit
#COMM_LIBS += $(shell [ -e ${NWCHEM_TOP}/src/tools/build/comex/config.h ] && grep LIBS\ = ${NWCHEM_TOP}/src/tools/build/comex/Makefile|grep -v _LIBS| cut -b 8-) -lpthread
COMM_LIBS := $(COMM_LIBS) $(shell [ -e ${GA_PATH}/bin/comex-config ] && ${GA_PATH}/bin/comex-config --libs) -lpthread
endif
ifdef COMM_LIBS
CORE_LIBS += $(COMM_LIBS)
endif
#endif
ifdef USE_CRAYSHASTA
CORE_LIBS += -lpmi2
@ -3783,9 +3780,6 @@ ifdef USE_LINUXAIO
CORE_LIBS += -lrt
endif
# g++ GNU compatibility (might go away)
#CORE_LIBS += -lstdc++
EXTRA_LIBS += $(CONFIG_LIBS)
CORE_LIBS += $(EXTRA_LIBS)
@ -3914,8 +3908,6 @@ else
else
CORE_LIBS += -larmci
endif
else
CORE_LIBS +=
endif
endif
@ -4020,8 +4012,6 @@ else
$(error )
ifdef OLD_GA
CORE_LIBS += -ltcgmsg
else
CORE_LIBS +=
endif
endif
endif