1
1

Merge pull request #2739 from rhc54/topic/wrappers

Add some missing qualifiers to the wrapper compilers for -lopen-rte and -lopen-pal
Этот коммит содержится в:
Ralph Castain 2017-01-17 05:49:35 -08:00 коммит произвёл GitHub
родитель 568b58af75 2fb9e7cc2b
Коммит 817e0fff82
2 изменённых файлов: 6 добавлений и 6 удалений

Просмотреть файл

@ -15,8 +15,8 @@ pkgincludedir=@opalincludedir@
# static linking (they're pulled in by libopen-rte.so's implicit # static linking (they're pulled in by libopen-rte.so's implicit
# dependencies), so only list these in Libs.private. # dependencies), so only list these in Libs.private.
# #
Libs: -L${libdir} @ORTE_PKG_CONFIG_LDFLAGS@ -lopen-rte Libs: -L${libdir} @ORTE_PKG_CONFIG_LDFLAGS@ -l@ORTE_LIB_PREFIX@open-rte
Libs.private: -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@ Libs.private: -l@OPAL_LIB_PREFIX@open-pal @ORTE_WRAPPER_EXTRA_LIBS@
# #
# It is safe to hard-wire the -I before the EXTRA_INCLUDES because we # It is safe to hard-wire the -I before the EXTRA_INCLUDES because we
# will not be installing this .pc file unless --enable-devel-headers is # will not be installing this .pc file unless --enable-devel-headers is

Просмотреть файл

@ -20,10 +20,10 @@ linker_flags=@ORTE_WRAPPER_EXTRA_LDFLAGS@
# intentionally always link in open-pal and open-rte in # intentionally always link in open-pal and open-rte in
# ortecc/ortec++ because we intend ORTE applications to use both the # ortecc/ortec++ because we intend ORTE applications to use both the
# ORTE and OPAL APIs. # ORTE and OPAL APIs.
libs=-lopen-rte -lopen-pal libs=-l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal
libs_static=-lopen-rte -lopen-pal @ORTE_WRAPPER_EXTRA_LIBS@ libs_static=-l@ORTE_LIB_PREFIX@open-rte -l@OPAL_LIB_PREFIX@open-pal @ORTE_WRAPPER_EXTRA_LIBS@
dyn_lib_file=libopen-rte.@OPAL_DYN_LIB_SUFFIX@ dyn_lib_file=lib@ORTE_LIB_PREFIX@open-rte.@OPAL_DYN_LIB_SUFFIX@
static_lib_file=libopen-rte.a static_lib_file=lib@ORTE_LIB_PREFIX@open-rte.a
required_file= required_file=
includedir=${includedir} includedir=${includedir}
libdir=${libdir} libdir=${libdir}