Remove residual references to -lopen-rte

Signed-off-by: Austen Lauria <[email protected]>

Author: awlauria

contrib/scaling/Makefile

@@ -11,7 +11,7 @@ mpi_no_op: mpi_no_op.c
 	mpicc -o mpi_no_op mpi_no_op.c
 
 mpi_memprobe: mpi_memprobe.c
-	mpicc -o mpi_memprobe mpi_memprobe.c -lopen-pal -lopen-rte
+	mpicc -o mpi_memprobe mpi_memprobe.c -lopen-pal
 
 clean:
 	rm -f $(PROGS) *~

ompi/tools/wrappers/ompi-c.pc.in

@@ -13,10 +13,9 @@ libdir=@libdir@
 pkgincludedir=@opalincludedir@
 #
 # Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
-# static linking (they're pulled in by libopen-rte.so's implicit
-# dependencies), so only list these in Libs.private.
+# static linking, so only list these in Libs.private.
 #
 Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ -l@OMPI_LIBMPI_NAME@
-Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+Libs.private: -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 #
 Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CFLAGS@

ompi/tools/wrappers/ompi-cxx.pc.in

@@ -13,10 +13,9 @@ libdir=@libdir@
 pkgincludedir=@opalincludedir@
 #
 # Note that -lopen-pal and all the EXTRA_LIBS are only necessary when
-# static linking (they're pulled in by libopen-rte.so's implicit
-# dependencies), so only list these in Libs.private.
+# static linking so only list these in Libs.private.
 #
 Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_WRAPPER_CXX_LIB@ -l@OMPI_LIBMPI_NAME@
-Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+Libs.private: -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 #
 Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_CXXFLAGS@

ompi/tools/wrappers/ompi-fort.pc.in

@@ -17,5 +17,5 @@ pkgincludedir=@opalincludedir@
 # dependencies), so only list these in Libs.private.
 #
 Libs: -L${libdir} @OMPI_PKG_CONFIG_LDFLAGS@ @OMPI_FORTRAN_USEMPIF08_LIB@ @OMPI_FORTRAN_USEMPI_LIB@ @OMPI_FORTRAN_MPIFH_LINK@ -l@OMPI_LIBMPI_NAME@
-Libs.private: -lopen-rte -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
+Libs.private: -lopen-pal @OMPI_WRAPPER_EXTRA_LIBS@
 Cflags: -I${includedir} @OMPI_WRAPPER_EXTRA_CPPFLAGS@ @OMPI_WRAPPER_EXTRA_FCFLAGS@

ompi/tools/wrappers/ompi_wrapper_script.in

@@ -66,7 +66,7 @@ my $linker_flags = $libdir_flag . $libdir . " " . $extra_ldflags;
 # pulled in implicitly) because we intend MPI applications to only use
 # the MPI API.
 my $libs = "-l".$ompi_libmpi_name." " . $extra_libs;
-my $libs_static = "-l".$ompi_libmpi_name." -lopen-rte -lopen-pal " . $extra_libs;
+my $libs_static = "-l".$ompi_libmpi_name." -lopen-pal " . $extra_libs;
 
 my $have_dynamic = 0;
 if (-e $libdir . "/lib".$ompi_libmpi_name."." . $dynamic_lib_suffix) {

opal/tools/wrappers/opal_wrapper.c

@@ -744,8 +744,8 @@ int main(int argc, char *argv[])
                switch.  It should only be used by Open MPI developers
                -- not end users.  It will cause mpicc to use the
                static library list, even if we're compiling
-               dynamically (i.e., it'll specifically -lopen-rte and
-               -lopen-pal (and all their dependent libs)).  We provide
+               dynamically (i.e., it'll specifically -lopen-pal
+               (and all their dependent libs)).  We provide
                this flag for test MPI applications that also invoke
                ORTE and/or OPAL function calls.