1
1

libfabric: pass the appropriate LDFLAGS to libfabric components

When compiling against an external libfabric, ensure to also pass the
appropriate -L flags so that the compiler/linker can find it.
Этот коммит содержится в:
Jeff Squyres 2015-02-19 05:35:38 -08:00
родитель 2d636147e3
Коммит 6098b84294
3 изменённых файлов: 10 добавлений и 4 удалений

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

@ -1,7 +1,7 @@
#
# Copyright (c) 2013-2014 Intel, Inc. All rights reserved
#
# Copyright (c) 2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2014-2015 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -45,8 +45,10 @@ endif
mcacomponentdir = $(ompilibdir)
mcacomponent_LTLIBRARIES = $(component_install)
mca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources)
mca_mtl_ofi_la_LDFLAGS = \
$(opal_common_libfabric_LDFLAGS) \
-module -avoid-version
mca_mtl_ofi_la_LIBADD = $(opal_common_libfabric_LIBADD)
mca_mtl_ofi_la_LDFLAGS = -module -avoid-version
noinst_LTLIBRARIES = $(component_noinst)
libmca_mtl_ofi_la_SOURCES = $(mtl_ofi_sources)

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

@ -11,7 +11,7 @@
# All rights reserved.
# Copyright (c) 2006 Sandia National Laboratories. All rights
# reserved.
# Copyright (c) 2010-2014 Cisco Systems, Inc. All rights reserved.
# Copyright (c) 2010-2015 Cisco Systems, Inc. All rights reserved.
# $COPYRIGHT$
#
# Additional copyrights may follow
@ -88,7 +88,9 @@ endif
mcacomponentdir = $(opallibdir)
mcacomponent_LTLIBRARIES = $(component)
mca_btl_usnic_la_SOURCES = $(component_sources)
mca_btl_usnic_la_LDFLAGS = -module -avoid-version
mca_btl_usnic_la_LDFLAGS = \
$(opal_common_libfabric_LDFLAGS) \
-module -avoid-version
mca_btl_usnic_la_LIBADD = $(opal_common_libfabric_LIBADD)
noinst_LTLIBRARIES = $(lib)

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

@ -50,6 +50,7 @@ AC_DEFUN([MCA_opal_common_libfabric_CONFIG],[
# This is for components that build with libfabric support
AC_SUBST(opal_common_libfabric_CPPFLAGS)
AC_SUBST(opal_common_libfabric_LDFLAGS)
AC_SUBST(opal_common_libfabric_LIBADD)
# This is for building the libfabric component itself
@ -294,6 +295,7 @@ AC_DEFUN([_OPAL_COMMON_LIBFABRIC_SETUP_LIBFABRIC_EXTERNAL],[
[opal_common_libfabric_happy=1],
[opal_common_libfabric_happy=0])
opal_common_libfabric_LDFLAGS="-L$opal_libfabric_libdir"
opal_common_libfabric_LIBADD="-lfabric"
])