From 6b1acf77cc66ee16fd8e7f8e6ea5cdeb78199d5f Mon Sep 17 00:00:00 2001 From: Jeff Squyres Date: Tue, 28 Oct 2014 17:17:21 -0700 Subject: [PATCH] configury: add OPAL/ORTE lib prefixes in oshmem wrapper data files These 2 files were missed in open-mpi/ompi@894acb0aa874e9bd0f6ad96a01d68bc87d1a46cf. --- oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in | 2 +- oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in b/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in index 5af65b2dbf..1e9be38f86 100644 --- a/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in +++ b/oshmem/tools/wrappers/shmemcc-wrapper-data.txt.in @@ -30,7 +30,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ # etc. are pulled in implicitly) because we intend SHMEM/MPI # applications to only use the SHMEM and MPI APIs. libs=-loshmem -lmpi -libs_static=-loshmem -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ +libs_static=-loshmem -lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@ dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@ static_lib_file=liboshmem.a required_file= diff --git a/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in b/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in index cb3d61e25e..0546d8fbac 100644 --- a/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in +++ b/oshmem/tools/wrappers/shmemfort-wrapper-data.txt.in @@ -29,7 +29,7 @@ linker_flags=@OMPI_WRAPPER_EXTRA_LDFLAGS@ # etc. are pulled in implicitly) because we intend SHMEM/MPI # applications to only use the SHMEM and MPI APIs. libs=-loshmem -lmpi_mpifh -lmpi -libs_static=-loshmem -lmpi_mpifh -lmpi -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@ +libs_static=-loshmem -lmpi_mpifh -lmpi -l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @OMPI_WRAPPER_EXTRA_LIBS@ dyn_lib_file=liboshmem.@OPAL_DYN_LIB_SUFFIX@ static_lib_file=liboshmem.a required_file=@OMPI_WRAPPER_FORTRAN_REQUIRED_FILE@